diff --git a/CXX/yapi.cpp b/CXX/yapi.cpp
index 3c36c0c76..149f69827 100644
--- a/CXX/yapi.cpp
+++ b/CXX/yapi.cpp
@@ -676,7 +676,7 @@ YAPPrologPredicate::YAPPrologPredicate(YAPAtom name,
                                        YAPModule mod,
                                        bool tabled,
                                        bool logical_updates,
-                                       bool thread_local,
+                                       bool is_thread_local,
                                        bool sourced,
                                        bool discontiguous,
                                        bool multiFile,
@@ -689,7 +689,7 @@ YAPPrologPredicate::YAPPrologPredicate(YAPAtom name,
                                        size_t mega_clause
                                        ) : YAPPredicate(name, arity, mod) {
   if (!ap) return;
-  if (thread_local) {
+  if (is_thread_local) {
     if (ap->cs.p_code.NOfClauses || tabled)
       return;
     ap->PredFlags |= (ThreadLocalPredFlag|LogUpdatePredFlag);
diff --git a/packages/myddas/odbc/CMakeLists.txt b/packages/myddas/odbc/CMakeLists.txt
index fb0701890..a16b26ac2 100644
--- a/packages/myddas/odbc/CMakeLists.txt
+++ b/packages/myddas/odbc/CMakeLists.txt
@@ -21,9 +21,6 @@ add_definitions (-DMYDDAS_ODBC=1)
 add_library (Yapodbc SHARED ${YAPODBC_SOURCES})
 target_link_libraries(Yapodbc libYap ${ODBC_LIBRARIES})
 include_directories (${ODBC_INCLUDE_DIRECTORIES} ..)
-else()
-  add_definitions (-DMYDDAS_ODBC=0)
-  endif (ODBC_FOUND)
 
 set_target_properties (Yapodbc PROPERTIES
   POSITION_INDEPENDENT_CODE ON
@@ -31,9 +28,11 @@ set_target_properties (Yapodbc PROPERTIES
   SOVERSION ${SO_MAJOR}
   )
 
-
    install(TARGETS  Yapodbc
     LIBRARY DESTINATION ${libdir}
     ARCHIVE DESTINATION ${libdir}
     )
 
+else()
+  add_definitions (-DMYDDAS_ODBC=0)
+  endif (ODBC_FOUND)