diff --git a/configure b/configure
index 4d2109dbd..cb3c82deb 100755
--- a/configure
+++ b/configure
@@ -4909,7 +4909,7 @@ _ACEOF
 
 
 
-if test "$or-parallelism" = no
+if test "$orparallelism" = no
 then
   $as_echo "#define MAX_WORKERS 1" >>confdefs.h
 
@@ -4918,6 +4918,11 @@ else
 #define MAX_WORKERS $yap_cv_max_workers
 _ACEOF
 
+  if test "$orparallelism" = copy
+  then
+    use_malloc="no"
+  fi
+  tabling="no"
 fi
 
 if test "$threads" = no
@@ -10771,8 +10776,8 @@ esac
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # Files that config.status was made for.
-config_files="$ac_config_files"
-config_headers="$ac_config_headers"
+config_files="`echo $ac_config_files`"
+config_headers="`echo $ac_config_headers`"
 
 _ACEOF
 
diff --git a/configure.in b/configure.in
index 6598b1197..0c0f28f6b 100755
--- a/configure.in
+++ b/configure.in
@@ -441,11 +441,16 @@ AC_SUBST(DefHeapSpace)
 AC_SUBST(DefStackSpace)
 AC_SUBST(DefTrailSpace)
 
-if test "$or-parallelism" = no
+if test "$orparallelism" = no
 then
   AC_DEFINE(MAX_WORKERS,1)
 else
   AC_DEFINE_UNQUOTED(MAX_WORKERS,$yap_cv_max_workers)
+  if test "$orparallelism" = copy
+  then
+    use_malloc="no"
+  fi
+  tabling="no"
 fi
 
 if test "$threads" = no
diff --git a/include/YapRegs.h b/include/YapRegs.h
index a8ce0d043..1485e3414 100644
--- a/include/YapRegs.h
+++ b/include/YapRegs.h
@@ -21,7 +21,7 @@ typedef struct trail_frame {
 #else
 typedef Term *tr_fr_ptr;
 
-#define TrailTerm(X)   ((X)->term)
+#define TrailTerm(X)   (*(CELL*)(X))
 #endif
 
 typedef void *choiceptr;