diff --git a/dip1000.mak b/dip1000.mak
index 2b6e6773a03..075421e68d2 100644
--- a/dip1000.mak
+++ b/dip1000.mak
@@ -40,7 +40,7 @@ aa[std.path]=-dip25 #    TODO
 aa[std.process]=-dip1000
 aa[std.random]=-dip1000
 aa[std.signals]=-dip1000
-aa[std.socket]=-dip1000
+aa[std.socket]=-dip25
 aa[std.stdint]=-dip1000
 aa[std.stdio]=-dip25 #    TODO
 aa[std.string]=-dip1000
diff --git a/posix.mak b/posix.mak
index fb16c08c5e5..864f10031b9 100644
--- a/posix.mak
+++ b/posix.mak
@@ -361,7 +361,7 @@ UT_D_OBJS:=$(addprefix $(ROOT)/unittest/,$(addsuffix $(DOTOBJ),$(D_MODULES)))
 $(UT_D_OBJS): $(ALL_D_FILES)
 $(UT_D_OBJS): $(ROOT)/unittest/%$(DOTOBJ): %.d
 	@mkdir -p $(dir $@)
-	$(DMD) $(DFLAGS) $(UDFLAGS) -c -of$@ $<
+	$(DMD) $(DFLAGS) $(UDFLAGS) $(aa[$(subst /,.,$(basename $<))]) -c -of$@ $<
 
 ifneq (1,$(SHARED))
 
diff --git a/std/uni.d b/std/uni.d
index e52920236fc..70fc275aec3 100644
--- a/std/uni.d
+++ b/std/uni.d
@@ -2185,7 +2185,7 @@ public struct InversionList(SP=GcPolicy)
         assert(set.byInterval.equal([tuple('A','E'), tuple('a','e')]));
         -----------
     */
-    @property auto byInterval() scope
+    @property auto byInterval() scope return
     {
         return Intervals!(typeof(data))(data);
     }
@@ -2795,7 +2795,7 @@ private:
     // a random-access range of integral pairs
     static struct Intervals(Range)
     {
-        this(Range sp) scope
+        this(return scope Range sp) scope @trusted // FIXME
         {
             slice = sp;
             start = 0;