diff --git a/vm/data_gc.c b/vm/data_gc.c
index 0a1fad575a..24f7cfecb9 100755
--- a/vm/data_gc.c
+++ b/vm/data_gc.c
@@ -730,7 +730,6 @@ void garbage_collection(CELL gen,
 
 	/* collect objects referenced from stacks and environment */
 	collect_roots();
-	
 	/* collect objects referenced from older generations */
 	collect_cards();
 
diff --git a/vm/factor.c b/vm/factor.c
index 20667a23f5..5825f97bdd 100755
--- a/vm/factor.c
+++ b/vm/factor.c
@@ -36,22 +36,36 @@ void do_stage1_init(void)
 	fprintf(stderr,"*** Stage 2 early init... ");
 	fflush(stderr);
 
+	GROWABLE_ARRAY(words);
+
 	begin_scan();
 
 	CELL obj;
 	while((obj = next_object()) != F)
 	{
 		if(type_of(obj) == WORD_TYPE)
-		{
-			F_WORD *word = untag_object(obj);
-			default_word_code(word,false);
-			update_word_xt(word);
-		}
+			GROWABLE_ADD(words,obj);
 	}
 
 	/* End heap scan */
 	gc_off = false;
 
+	GROWABLE_TRIM(words);
+	REGISTER_ROOT(words);
+
+	CELL i;
+	CELL length = array_capacity(untag_object(words));
+	for(i = 0; i < length; i++)
+	{
+		F_WORD *word = untag_word(array_nth(untag_array(words),i));
+		REGISTER_UNTAGGED(word);
+		default_word_code(word,false);
+		UNREGISTER_UNTAGGED(word);
+		update_word_xt(word);
+	}
+
+	UNREGISTER_ROOT(words);
+
 	iterate_code_heap(relocate_code_block);
 
 	userenv[STAGE2_ENV] = T;
diff --git a/vm/run.c b/vm/run.c
index d03d999ffd..cec19b5445 100755
--- a/vm/run.c
+++ b/vm/run.c
@@ -22,8 +22,11 @@ void fix_stacks(void)
 be stored in registers, so callbacks must save and restore the correct values */
 void save_stacks(void)
 {
-	stack_chain->datastack = ds;
-	stack_chain->retainstack = rs;
+	if(stack_chain)
+	{
+		stack_chain->datastack = ds;
+		stack_chain->retainstack = rs;
+	}
 }
 
 /* called on entry into a compiled callback */