diff --git a/core/bootstrap/primitives.factor b/core/bootstrap/primitives.factor
index d5cedaf7b3..de4c375a2a 100755
--- a/core/bootstrap/primitives.factor
+++ b/core/bootstrap/primitives.factor
@@ -5,7 +5,7 @@ USING: alien arrays byte-arrays generic hashtables
 hashtables.private io kernel math namespaces parser sequences
 strings vectors words quotations assocs layouts classes tuples
 kernel.private vocabs vocabs.loader source-files definitions
-slots classes.union words.private ;
+slots classes.union compiler.units ;
 
 ! Some very tricky code creating a bootstrap embryo in the
 ! host image.
diff --git a/core/compiler/errors/errors.factor b/core/compiler/errors/errors.factor
index c53937b9d9..65de89524a 100755
--- a/core/compiler/errors/errors.factor
+++ b/core/compiler/errors/errors.factor
@@ -10,7 +10,8 @@ SYMBOL: with-compiler-errors?
 
 : compiler-error ( error word -- )
     with-compiler-errors? get [
-        compiler-errors get set-at
+        compiler-errors get pick
+        [ set-at ] [ delete-at drop ] if
     ] [ 2drop ] if ;
 
 : compiler-error. ( error word -- )
diff --git a/core/cpu/ppc/bootstrap.factor b/core/cpu/ppc/bootstrap.factor
index 9fec630fd7..18c7e8b92e 100755
--- a/core/cpu/ppc/bootstrap.factor
+++ b/core/cpu/ppc/bootstrap.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.private kernel namespaces system
-cpu.ppc.assembler generator.fixup compiler.constants math
-layouts words vocabs ;
+cpu.ppc.assembler generator.fixup compiler.units
+compiler.constants math layouts words vocabs ;
 IN: bootstrap.ppc
 
 4 \ cell set
diff --git a/core/cpu/x86/bootstrap.factor b/core/cpu/x86/bootstrap.factor
index 7b609ab1c9..8fe5127ab0 100755
--- a/core/cpu/x86/bootstrap.factor
+++ b/core/cpu/x86/bootstrap.factor
@@ -1,8 +1,8 @@
-! Copyright (C) 2007 Slava Pestov.
+! Copyright (C) 2007, 2008 Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: bootstrap.image.private kernel namespaces system
 cpu.x86.assembler layouts compiler.units math generator.fixup
-compiler.constants ;
+compiler.constants vocabs ;
 IN: bootstrap.x86
 
 big-endian off