diff --git a/C/eval.c b/C/eval.c
index 4750aecaf..baaeab2ca 100644
--- a/C/eval.c
+++ b/C/eval.c
@@ -245,12 +245,12 @@ static Int cont_between( USES_REGS1 )
     Term tn;
     Int cmp;
 
-    cmp = Yap_acmp(t1, t2);
+    cmp = Yap_acmp(t1, t2 PASS_REGS);
     if (cmp == 0)
       cut_succeed();
     t[0] = t1;
     t[1] = MkIntTerm(1);
-    tn = Eval(Yap_MkApplTerm(FunctorPlus, 2, t));
+    tn = Eval(Yap_MkApplTerm(FunctorPlus, 2, t) PASS_REGS);
     EXTRA_CBACK_ARG(3,1) = tn;
     HB = B->cp_h = H;
     return TRUE;
@@ -336,11 +336,11 @@ init_between( USES_REGS1 )
 	Yap_Error(TYPE_ERROR_INTEGER, t3, "between/3");
 	return FALSE;
       }
-      if (Yap_acmp(t3, t1) >= 0 && Yap_acmp(t2,t3) >= 0 && P != FAILCODE)
+      if (Yap_acmp(t3, t1 PASS_REGS) >= 0 && Yap_acmp(t2,t3 PASS_REGS) >= 0 && P != FAILCODE)
 	cut_succeed();
       cut_fail();
     }
-    cmp = Yap_acmp(t1, t2);
+    cmp = Yap_acmp(t1, t2 PASS_REGS);
     if (cmp > 0) cut_fail();
     if (cmp == 0) {
       Yap_unify(ARG3, t1);
diff --git a/H/rheap.h b/H/rheap.h
index 6b7c7b5fa..89a6eabdd 100644
--- a/H/rheap.h
+++ b/H/rheap.h
@@ -247,6 +247,7 @@ static char     SccsId[] = "@(#)rheap.c	1.3 3/15/90";
 #define RestoreDBErasedMarker()  RestoreDBErasedMarker__( PASS_REGS1 )
 #define RestoreLogDBErasedMarker()  RestoreLogDBErasedMarker__( PASS_REGS1 )
 #define RestoreForeignCode()	RestoreForeignCode__( PASS_REGS1 )
+#define RestoreEmptyWakeups() RestoreEmptyWakeups__( PASS_REGS1 )
 #define RestoreAtoms() RestoreAtoms__( PASS_REGS1 )
 #define RestoreWideAtoms() RestoreWideAtoms__( PASS_REGS1 )
 #define RestoreSWIBlobs() RestoreSWIBlobs__( PASS_REGS1 )
@@ -548,7 +549,7 @@ RestoreDBTerm(DBTerm *dbr, int attachments USES_REGS)
 /* Restoring the heap */
 
 static void
-RestoreEmptyWakeups(void)
+RestoreEmptyWakeups__( USES_REGS1 )
 {
   int i;
   for (i=0; i < MaxEmptyWakeups; i++) {