diff --git a/collects/mzlib/process.ss b/collects/mzlib/process.ss
index c2ef3b2..44de233 100644
--- a/collects/mzlib/process.ss
+++ b/collects/mzlib/process.ss
@@ -107,7 +107,7 @@
 					    (when (thread? t)
 					      (thread-wait t)))])
 			       (twait so)
-			       (twait si)
+			       ;; (twait si) - if the process didn't wait, we don't need to!
 			       (twait se)))
 			    ((interrupt) (subprocess-kill subp #f))
 			    ((kill) (subprocess-kill subp #t))
diff --git a/collects/mzlib/thread.ss b/collects/mzlib/thread.ss
index b9bf279..ae4b9fe 100644
--- a/collects/mzlib/thread.ss
+++ b/collects/mzlib/thread.ss
@@ -69,7 +69,7 @@
 		 [tcp-close tcp-close]
 		 [tcp-accept tcp-accept]
 		 [tcp-accept/enable-break tcp-accept/enable-break])
-      (let ([l (tcp-listen port-number)]
+      (let ([l (tcp-listen port-number 5 #t)]
 	    [can-break? (break-enabled)])
 	(dynamic-wind
 	    void