diff --git a/OPTYap/locks_pthread.h b/OPTYap/locks_pthread.h
index 2924b9adc..6ea3fd38d 100644
--- a/OPTYap/locks_pthread.h
+++ b/OPTYap/locks_pthread.h
@@ -19,7 +19,7 @@
 
 #define INIT_LOCK(LOCK_VAR)    pthread_mutex_init(&(LOCK_VAR), NULL)
 #define DESTROY_LOCK(LOCK_VAR) pthread_mutex_destroy(&(LOCK_VAR))
-#define TRY_LOCK(LOCK_PTR)     pthread_mutex_trylock(&(LOCK_VAR))
+#define TRY_LOCK(LOCK_VAR)     pthread_mutex_trylock(&(LOCK_VAR))
 #define LOCK(LOCK_VAR)         pthread_mutex_lock(&(LOCK_VAR))
 #define UNLOCK(LOCK_VAR)       pthread_mutex_unlock(&(LOCK_VAR))
 static inline int
diff --git a/OPTYap/opt.config.h b/OPTYap/opt.config.h
index 7d9ca99ba..75a3ebac9 100644
--- a/OPTYap/opt.config.h
+++ b/OPTYap/opt.config.h
@@ -339,9 +339,12 @@
 #error LIMIT_TABLING requires USE_PAGES_MALLOC
 #endif
 
+#if defined(YAPOR) || defined(THREADS_FULL_SHARING) || defined(THREADS_CONSUMER_SHARING)
+#undef TABLING_EARLY_COMPLETION
+#endif
+
 #if defined(YAPOR) || defined(THREADS)
 #undef MODE_DIRECTED_TABLING
-#undef TABLING_EARLY_COMPLETION
 #undef INCOMPLETE_TABLING
 #undef LIMIT_TABLING
 #undef DETERMINISTIC_TABLING