diff --git a/C/c_interface.c b/C/c_interface.c
index 7c36a130c..df5a6dfb4 100644
--- a/C/c_interface.c
+++ b/C/c_interface.c
@@ -2414,8 +2414,10 @@ YAP_Init(YAP_init_args *yap_init)
   }
   yap_flags[FAST_BOOT_FLAG] = yap_init->FastBoot;
 #if defined(YAPOR) || defined(TABLING)
+#ifdef TABLING
   /* make sure we initialise this field */
   GLOBAL_root_dep_fr = NULL;
+#endif
   make_root_frames();
 #ifdef YAPOR
   init_workers();
diff --git a/OPTYap/or.threadengine.c b/OPTYap/or.threadengine.c
index b2fbc8a77..e9b3efad7 100644
--- a/OPTYap/or.threadengine.c
+++ b/OPTYap/or.threadengine.c
@@ -70,7 +70,7 @@ void make_root_choice_point(void) {
       and convert back to our own stack;
      */
     OldLCL0 = LCL0;
-    LCL0 = ThreadHandle[0].current_yaam_regs->LCL0_;
+    LCL0 = FOREIGN_ThreadHandle(0).current_yaam_regs->LCL0_;
     imageB = Get_GLOBAL_root_cp();
     /* we know B */
     B->cp_tr = TR =