diff --git a/basis/bootstrap/random/random.factor b/basis/bootstrap/random/random.factor
index 3782d517cf..f6527cdda1 100755
--- a/basis/bootstrap/random/random.factor
+++ b/basis/bootstrap/random/random.factor
@@ -13,4 +13,4 @@ IN: bootstrap.random
 [
     [ 32 random-bits ] with-system-random
     <mersenne-twister> random-generator set-global
-] "generator.random" add-init-hook
+] "bootstrap.random" add-init-hook
diff --git a/core/io/files/files.factor b/core/io/files/files.factor
index 5634336243..1634b7a3f1 100755
--- a/core/io/files/files.factor
+++ b/core/io/files/files.factor
@@ -1,9 +1,10 @@
 ! Copyright (C) 2004, 2008 Slava Pestov, Daniel Ehrenberg.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: io.backend io.files.private io hashtables kernel math
-memory namespaces sequences strings assocs arrays definitions
-system combinators splitting sbufs continuations destructors
-io.encodings io.encodings.binary init accessors math.order ;
+USING: io.backend io.files.private io hashtables kernel
+kernel.private math memory namespaces sequences strings assocs
+arrays definitions system combinators splitting sbufs
+continuations destructors io.encodings io.encodings.binary init
+accessors math.order ;
 IN: io.files
 
 HOOK: (file-reader) io-backend ( path -- stream )
@@ -194,7 +195,9 @@ SYMBOL: current-directory
 
 [
     cwd current-directory set-global
-    image parent-directory cwd prepend-path "resource-path" set-global
+    13 getenv cwd prepend-path \ image set-global
+    14 getenv cwd prepend-path \ vm set-global
+    image parent-directory "resource-path" set-global
 ] "io.files" add-init-hook
 
 : resource-path ( path -- newpath )
diff --git a/core/system/system.factor b/core/system/system.factor
index 98dc605acc..3c207c4ab5 100755
--- a/core/system/system.factor
+++ b/core/system/system.factor
@@ -55,15 +55,15 @@ UNION: unix bsd solaris linux ;
 
 PRIVATE>
 
+: image ( -- path ) \ image get-global ;
+
+: vm ( -- path ) \ vm get-global ;
+
 [
     8 getenv string>cpu \ cpu set-global
     9 getenv string>os \ os set-global
 ] "system" add-init-hook
 
-: image ( -- path ) 13 getenv ;
-
-: vm ( -- path ) 14 getenv ;
-
 : embedded? ( -- ? ) 15 getenv ;
 
 : os-envs ( -- assoc )