diff --git a/basis/command-line/command-line-docs.factor b/basis/command-line/command-line-docs.factor
index 11ee46c227..9a69614766 100644
--- a/basis/command-line/command-line-docs.factor
+++ b/basis/command-line/command-line-docs.factor
@@ -91,7 +91,7 @@ ARTICLE: "standard-cli-args" "Command line switches for general usage"
 } ;
 
 ARTICLE: "factor-boot-rc" "Bootstrap initialization file"
-"The botstrap initialization file is named " { $snippet "factor-boot-rc" } " on Windows and " { $snippet ".factor-boot-rc" } " on Unix. This file can contain " { $link require } " calls for vocabularies you use frequently, and other such long-running tasks that you do not want to perform every time Factor starts."
+"The bootstrap initialization file is named " { $snippet "factor-boot-rc" } " on Windows and " { $snippet ".factor-boot-rc" } " on Unix. This file can contain " { $link require } " calls for vocabularies you use frequently, and other such long-running tasks that you do not want to perform every time Factor starts."
 $nl
 "A word to run this file from an existing Factor session:"
 { $subsections run-bootstrap-init }
diff --git a/basis/io/files/info/info.factor b/basis/io/files/info/info.factor
index 500fd62cd3..a314361e9d 100644
--- a/basis/io/files/info/info.factor
+++ b/basis/io/files/info/info.factor
@@ -26,7 +26,7 @@ available-space free-space used-space total-space ;
 HOOK: file-system-info os ( path -- file-system-info )
 
 {
-    { [ os unix? ] [ "io.files.info" ] }
+    { [ os unix? ] [ "io.files.info.unix" ] }
     { [ os windows? ] [ "io.files.info.windows" ] }
 } cond require
 
diff --git a/basis/tools/deploy/deploy-tests.factor b/basis/tools/deploy/deploy-tests.factor
index 1412e65f95..987b4aa8a1 100644
--- a/basis/tools/deploy/deploy-tests.factor
+++ b/basis/tools/deploy/deploy-tests.factor
@@ -117,3 +117,9 @@ os macosx? [
 [ ] [ "tools.deploy.test.16" shake-and-bake run-temp-image ] unit-test
 
 [ ] [ "tools.deploy.test.17" shake-and-bake run-temp-image ] unit-test
+
+[ t ] [
+    "tools.deploy.test.18" shake-and-bake
+    deploy-test-command ascii [ readln ] with-process-reader
+    "test.image" temp-file =
+] unit-test
diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index e020980233..f8c3b3b031 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -43,7 +43,6 @@ IN: tools.deploy.shaker
         "io.thread" startup-hooks get delete-at
     ] unless
     strip-io? [
-        "io.files" startup-hooks get delete-at
         "io.backend" startup-hooks get delete-at
         "io.thread" startup-hooks get delete-at
     ] when
diff --git a/basis/tools/deploy/test/18/18.factor b/basis/tools/deploy/test/18/18.factor
new file mode 100644
index 0000000000..0676376701
--- /dev/null
+++ b/basis/tools/deploy/test/18/18.factor
@@ -0,0 +1,8 @@
+! Copyright (C) 2010 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
+USING: accessors io.streams.c math.parser system ;
+IN: tools.deploy.test.18
+
+: main ( -- ) image show ;
+
+MAIN: main
diff --git a/basis/tools/deploy/test/18/authors.txt b/basis/tools/deploy/test/18/authors.txt
new file mode 100644
index 0000000000..d4f5d6b3ae
--- /dev/null
+++ b/basis/tools/deploy/test/18/authors.txt
@@ -0,0 +1 @@
+Slava Pestov
\ No newline at end of file
diff --git a/basis/tools/deploy/test/18/deploy.factor b/basis/tools/deploy/test/18/deploy.factor
new file mode 100644
index 0000000000..66069d6430
--- /dev/null
+++ b/basis/tools/deploy/test/18/deploy.factor
@@ -0,0 +1,14 @@
+USING: tools.deploy.config ;
+H{
+    { deploy-name "tools.deploy.test.18" }
+    { deploy-ui? f }
+    { deploy-c-types? f }
+    { deploy-unicode? f }
+    { "stop-after-last-window?" t }
+    { deploy-io 1 }
+    { deploy-reflection 1 }
+    { deploy-word-props? f }
+    { deploy-math? f }
+    { deploy-threads? f }
+    { deploy-word-defs? f }
+}
diff --git a/extra/project-euler/ave-time/ave-time.factor b/extra/project-euler/ave-time/ave-time.factor
index ec190fed18..9927486eb7 100644
--- a/extra/project-euler/ave-time/ave-time.factor
+++ b/extra/project-euler/ave-time/ave-time.factor
@@ -1,11 +1,11 @@
 ! Copyright (c) 2007, 2008 Aaron Schaefer.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: combinators.smart formatting fry io kernel macros math
-math.functions math.statistics memory sequences tools.time ;
+USING: combinators.smart formatting fry io kernel macros math math.functions
+math.statistics memory sequences tools.time ;
 IN: project-euler.ave-time
 
 MACRO: collect-benchmarks ( quot n -- seq )
-    swap '[ _ [ [ [ _ nullary ] preserving ] gc benchmark 1000 / ] replicate ] ;
+    swap '[ _ [ [ [ _ nullary ] preserving ] gc benchmark 6 10^ / ] replicate ] ;
 
 : ave-time ( quot n -- )
     [