diff --git a/CMakeLists.txt b/CMakeLists.txt
index 825093d50..d3f950bf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -901,7 +901,7 @@ endif(NOT ANDROID)
 
 #
 
-install(FILES ${INCLUDE_HEADERS} ${CONFIGURATION_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Yap )
+install(FILES ${INCLUDE_HEADERS} ${CONFIGURATION_HEADERS} DESTINATION ${includedir}/Yap )
 
 
 
diff --git a/CXX/CMakeLists.txt b/CXX/CMakeLists.txt
index 168e84cef..c1ef100b3 100644
--- a/CXX/CMakeLists.txt
+++ b/CXX/CMakeLists.txt
@@ -15,7 +15,11 @@ if ( WIN32 OR ANDROID)
   set_property( DIRECTORY  APPEND PROPERTY COMPILE_DEFINITIONS  "_YAP_NOT_INSTALLED_=1;HAVE_CONFIG_H=1;_GNU_SOURCE;YAP_KERNEL=1" )
 else()
    add_lib(YAP++ ${CXX_SOURCES} )
-   target_link_libraries(YAP++ ${CMAKE_DL_LIBS} Py4YAP libYap)
+   if (WITH_PYTHON)
+     target_link_libraries(YAP++ Py4YAP )
+   endif()
+    target_link_libraries(YAP++ ${CMAKE_DL_LIBS} libYap)
+  
 
    MY_install(TARGETS  YAP++
      LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/CXX/yapi.cpp b/CXX/yapi.cpp
index c3bc213f0..85b6e6fb3 100644
--- a/CXX/yapi.cpp
+++ b/CXX/yapi.cpp
@@ -10,7 +10,7 @@ extern "C" {
 #include "android/log.h"
 #endif
 
-#if 1
+#if YAP_PYTHON
 #include "Python.h"
 #endif
 
@@ -457,9 +457,11 @@ bool YAPEngine::call(YAPPredicate ap, YAPTerm ts[]) {
 
 bool YAPEngine::mgoal(Term t, Term tmod) {
   sigjmp_buf buf, *oldp = LOCAL_RestartEnv;
-  PyThreadState *_save;
+#if YAP_PYTHON
+  //PyThreadState *_save;
 
   //  _save = PyEval_SaveThread();
+#endif
   try {
     CACHE_REGS
     BACKUP_MACHINE_REGS();
diff --git a/packages/python/pl2py.c b/packages/python/pl2py.c
index 130c77776..cde944664 100644
--- a/packages/python/pl2py.c
+++ b/packages/python/pl2py.c
@@ -263,7 +263,7 @@ PyObject *term_to_python(term_t t, bool eval, PyObject *o, bool cvt) {
             PyObject *ip = term_to_python(trhs, eval, o, cvt);
             if (PySequence_Check(v)) {
 #if PY_MAJOR_VERSION < 3
-             if (PyLong_Check(ip) {
+	      if (PyLong_Check(ip)) {
                 min = PyLong_AsLong(ip);
          } else if (PyInt_Check(ip) {
                 min = PyInt_asInt(ip);