diff --git a/extra/asn1/asn1.factor b/extra/asn1/asn1.factor
index 32e3602f8f..50102d1929 100644
--- a/extra/asn1/asn1.factor
+++ b/extra/asn1/asn1.factor
@@ -98,7 +98,7 @@ DEFER: read-ber
 
 SYMBOL: end
 
-: (read-array) ( stream -- )
+: (read-array) ( -- )
     elements get element-id [
         elements get element-syntax read-ber
         dup end = [ drop ] [ , (read-array) ] if
@@ -106,7 +106,7 @@ SYMBOL: end
 
 : read-array ( -- array ) [ (read-array) ] { } make ;
 
-: set-case ( -- )
+: set-case ( -- object )
     elements get element-newobj
     elements get element-objtype {
         { "boolean" [ "\0" = not ] }
diff --git a/extra/benchmark/sockets/sockets.factor b/extra/benchmark/sockets/sockets.factor
index c7510aecb0..1c33bfc4dc 100755
--- a/extra/benchmark/sockets/sockets.factor
+++ b/extra/benchmark/sockets/sockets.factor
@@ -1,6 +1,6 @@
 USING: io.sockets io kernel math threads io.encodings.ascii
-debugger tools.time prettyprint concurrency.count-downs
-namespaces arrays continuations ;
+io.streams.duplex debugger tools.time prettyprint
+concurrency.count-downs namespaces arrays continuations ;
 IN: benchmark.sockets
 
 SYMBOL: counter
diff --git a/extra/http/server/cgi/cgi.factor b/extra/http/server/cgi/cgi.factor
index abf47c42fc..20eb7318d0 100755
--- a/extra/http/server/cgi/cgi.factor
+++ b/extra/http/server/cgi/cgi.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: namespaces kernel assocs io.files combinators
-arrays io.launcher io http.server.static http.server
+USING: namespaces kernel assocs io.files io.streams.duplex
+combinators arrays io.launcher io http.server.static http.server
 http accessors sequences strings math.parser fry ;
 IN: http.server.cgi
 
diff --git a/extra/pack/pack.factor b/extra/pack/pack.factor
index 0855a866e9..5320583df0 100755
--- a/extra/pack/pack.factor
+++ b/extra/pack/pack.factor
@@ -159,7 +159,7 @@ MACRO: (unpack) ( str -- quot )
         ] [ ] make
         1quotation [ { } make ] append
         1quotation %
-        \ with-string-input ,
+        \ with-string-reader ,
     ] [ ] make ;
 
 : unpack-native ( seq str -- seq )
diff --git a/extra/smtp/server/server.factor b/extra/smtp/server/server.factor
index 975a49b318..f23ee138d5 100755
--- a/extra/smtp/server/server.factor
+++ b/extra/smtp/server/server.factor
@@ -1,7 +1,8 @@
 ! Copyright (C) 2007 Elie CHAFTARI
 ! See http://factorcode.org/license.txt for BSD license.
 USING: combinators kernel prettyprint io io.timeouts io.server
-sequences namespaces io.sockets continuations calendar io.encodings.ascii ;
+sequences namespaces io.sockets continuations calendar
+io.encodings.ascii io.streams.duplex ;
 IN: smtp.server
 
 ! Mock SMTP server for testing purposes.
@@ -65,7 +66,7 @@ SYMBOL: data-mode
     "Starting SMTP server on port " write dup . flush
     "127.0.0.1" swap <inet4> ascii <server> [
         accept drop [
-            default-timeout
+            1 minutes timeouts
             "220 hello\r\n" write flush
             process
             global [ flush ] bind