diff --git a/library/test/test.factor b/library/test/test.factor
index 4b1f659115..52976e35fb 100644
--- a/library/test/test.factor
+++ b/library/test/test.factor
@@ -10,8 +10,7 @@ prettyprint sequences stdio strings unparser vectors words ;
 : print-test ( input output -- )
     "--> " write 2list . flush ;
 
-: keep-datastack ( quot -- )
-    datastack >r call r> set-datastack drop ;
+: keep-datastack ( quot -- ) datastack slip set-datastack drop ;
 
 : time ( code -- )
     #! Evaluates the given code and prints the time taken to
diff --git a/library/unix/io.factor b/library/unix/io.factor
index b99278ef8b..6b64977bd4 100644
--- a/library/unix/io.factor
+++ b/library/unix/io.factor
@@ -326,7 +326,7 @@ M: writer stream-close ( stream -- )
     dup stream-flush port-handle close ;
 
 ! Make a duplex stream for reading/writing a pair of fds
-: <fd-stream> ( infd outfd flush? -- )
+: <fd-stream> ( infd outfd flush? -- stream )
     >r >r <reader> r> <writer> r> <duplex-stream> ;
 
 ! Copying from a reader to a writer