diff --git a/core/words/words-docs.factor b/core/words/words-docs.factor
index f1cc678d17..4903f8933b 100755
--- a/core/words/words-docs.factor
+++ b/core/words/words-docs.factor
@@ -1,5 +1,5 @@
-USING: definitions help.markup help.syntax kernel
-kernel.private parser words.private vocabs classes quotations
+USING: definitions help.markup help.syntax kernel parser
+kernel.private words.private vocabs classes quotations
 strings effects compiler.units ;
 IN: words
 
diff --git a/extra/io/server/server-tests.factor b/extra/io/server/server-tests.factor
index 24b4c231d1..6c3c177513 100755
--- a/extra/io/server/server-tests.factor
+++ b/extra/io/server/server-tests.factor
@@ -1,4 +1,4 @@
 IN: temporary
 USING: tools.test io.server io.server.private ;
 
-{ 1 0 } [ [ ] server-loop ] must-infer-as
+{ 2 0 } [ [ ] server-loop ] must-infer-as
diff --git a/extra/io/unix/unix-tests.factor b/extra/io/unix/unix-tests.factor
index 998168ddaa..ca5d0f29fd 100755
--- a/extra/io/unix/unix-tests.factor
+++ b/extra/io/unix/unix-tests.factor
@@ -134,7 +134,7 @@ datagram-client delete-file
 
 [
     image binary [
-        B{ 1 2 } server-addr
+        B{ 1 2 } datagram-server <local>
         stdio get send
     ] with-file-reader
 ] must-fail