diff --git a/basis/tools/deploy/shaker/shaker.factor b/basis/tools/deploy/shaker/shaker.factor
index 2fc1ada108..37eec5eae2 100755
--- a/basis/tools/deploy/shaker/shaker.factor
+++ b/basis/tools/deploy/shaker/shaker.factor
@@ -357,7 +357,7 @@ IN: tools.deploy.shaker
     V{ } set-namestack
     V{ } set-catchstack
     "Saving final image" show
-    [ save-image-and-exit ] call-clear ;
+    save-image-and-exit ;
 
 SYMBOL: deploy-vocab
 
@@ -421,10 +421,10 @@ SYMBOL: deploy-vocab
 : deploy-error-handler ( quot -- )
     [
         strip-debugger?
-        [ error-continuation get call>> callstack>array die ]
+        [ error-continuation get call>> callstack>array die 1 exit ]
         ! Don't reference these words literally, if we're stripping the
         ! debugger out we don't want to load the prettyprinter at all
-        [ [:c] execute nl [print-error] execute flush ] if
+        [ [:c] execute( -- ) nl [print-error] execute( error -- ) flush ] if
         1 exit
     ] recover ; inline
 
diff --git a/vm/data_gc.c b/vm/data_gc.c
index a91eff6783..11c1639fea 100755
--- a/vm/data_gc.c
+++ b/vm/data_gc.c
@@ -160,7 +160,8 @@ void copy_roots(void)
 		copy_handle(&stacks->catchstack_save);
 		copy_handle(&stacks->current_callback_save);
 
-		mark_active_blocks(stacks);
+		if(!performing_compaction)
+			mark_active_blocks(stacks);
 
 		stacks = stacks->next;
 	}
diff --git a/vm/data_gc.h b/vm/data_gc.h
index 354c9398a5..feae26706d 100755
--- a/vm/data_gc.h
+++ b/vm/data_gc.h
@@ -5,6 +5,7 @@ DLLEXPORT void minor_gc(void);
 
 F_ZONE *newspace;
 bool performing_gc;
+bool performing_compaction;
 CELL collecting_gen;
 
 /* if true, we collecting AGING space for the second time, so if it is still
diff --git a/vm/image.c b/vm/image.c
index a1987180d0..9cc97df0d9 100755
--- a/vm/image.c
+++ b/vm/image.c
@@ -187,7 +187,9 @@ void primitive_save_image_and_exit(void)
 		userenv[i] = F;
 
 	/* do a full GC + code heap compaction */
+	performing_compaction = true;
 	compact_code_heap();
+	performing_compaction = false;
 
 	UNREGISTER_C_STRING(path);