diff --git a/src/mzscheme/gc2/compact.c b/src/mzscheme/gc2/compact.c
index 36600781ea..aeab6fe7e1 100644
--- a/src/mzscheme/gc2/compact.c
+++ b/src/mzscheme/gc2/compact.c
@@ -3036,7 +3036,7 @@ static void check_ptr(void **a)
 }
 # endif
 
-static void check_variable_stack()
+void GC_check_variable_stack()
 {
   void **limit, **var_stack;
 # if CHECK_STACK_PTRS
@@ -4021,7 +4021,7 @@ void *GC_malloc_one_tagged(size_t size_in_bytes)
   void **m, **naya;
 
 #if CHECKS
-  check_variable_stack();
+  GC_check_variable_stack();
 #endif
 
   size_in_words = ((size_in_bytes + 3) >> LOG_WORD_SIZE);
@@ -4099,7 +4099,7 @@ static gcINLINE void *malloc_untagged(size_t size_in_bytes, mtype_t mtype, MSet
   void **m, **naya;
 
 #if CHECKS
-  check_variable_stack();
+  GC_check_variable_stack();
 #endif
 
   if (!size_in_bytes)
diff --git a/src/mzscheme/src/env.c b/src/mzscheme/src/env.c
index 575d1b3fc6..aee4ba9904 100644
--- a/src/mzscheme/src/env.c
+++ b/src/mzscheme/src/env.c
@@ -163,6 +163,8 @@ Scheme_Env *scheme_basic_env()
 
     env = scheme_make_empty_env();
     scheme_install_initial_module_set(env);
+    scheme_set_param(scheme_current_config(), MZCONFIG_ENV, 
+		     (Scheme_Object *)env); 
 
     scheme_init_port_config();
     scheme_init_port_fun_config();