diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd4a894ea..90bef4b2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -132,7 +132,7 @@ else()
     if (WIN32)
         List (APPEND YLIBS    $<TARGET_OBJECTS:YAP++> )
         if (WITH_PYTHON )
-            List (APPEND YLIBS    $<TARGET_OBJECTS:Obj4Py> )
+            List (APPEND YLIBS    $<TARGET_OBJECTS:Py4YAP> )
         endif()
     endif()
 
diff --git a/CXX/yapdb.hh b/CXX/yapdb.hh
index 7fddf1375..01ef66dec 100644
--- a/CXX/yapdb.hh
+++ b/CXX/yapdb.hh
@@ -254,6 +254,7 @@ class X_API YAPPrologPredicate : public YAPPredicate {
 public:
   YAPPrologPredicate(YAPTerm t) : YAPPredicate(t){};
   YAPPrologPredicate(const char *s, arity_t arity) : YAPPredicate(s, arity){};
+  YAPPrologPredicate(YAPAtom s, arity_t arity) : YAPPredicate(s, arity){};
   /// add a new clause
   bool assertClause(YAPTerm clause, bool last = true,
 		    YAPTerm source = YAPTerm());
diff --git a/cmake/python.cmake b/cmake/python.cmake
index e3cb40b61..50da2c33f 100644
--- a/cmake/python.cmake
+++ b/cmake/python.cmake
@@ -1,4 +1,4 @@
-set (Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.6 3.4 )
+set (Python_ADDITIONAL_VERSIONS 3.7 3.6 ) #3.5 3.6 3.4 )
 
 
 #  PYTHONLIBS_FOUND           - have the Python libs been found
@@ -9,9 +9,9 @@ set (Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.6 3.4 )
 #   PYTHONLIBS_VERSION_STRING  - version of the Python libs found (since CMake 2.8.8)
 ##
 #
-if (WIN32)
+if (WIN320)
     set (PYTHONLIBS_FOUND YES CACHE BOOL "MINGW/MSYS2" FORCE )
-    set (PYTHON_LIBRARY C:/msys64/mingw64/lib/libpython3.5m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
+    set (PYTHON_LIBRARY C:/msys64/mingw64/lib/libpython3.6m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
     set (PYTHON_LIBRARIES C:/msys64/mingw64/lib/libpython3.5m.dll.a CACHE FILEPATH "MINGW/MSYS2" FORCE )
     set (PYTHON_INCLUDE_PATH C:/msys64/mingw64/include/python3.5m CACHE PATH "MINGW/MSYS2" FORCE )
     set (PYTHON_INCLUDE_DIRS C:/msys64/mingw64/include/python3.5m CACHE PATH "MINGW/MSYS2" FORCE  )
diff --git a/packages/python/swig/CMakeLists.txt b/packages/python/swig/CMakeLists.txt
index ba28e9ba2..a781c48d4 100644
--- a/packages/python/swig/CMakeLists.txt
+++ b/packages/python/swig/CMakeLists.txt
@@ -24,9 +24,7 @@ SET_SOURCE_FILES_PROPERTIES(../../swig/yap.i PROPERTIES SWIG_MODULE_NAME yap)
 
 if (WIN32)
 
-set (SYS_DLLS ${GMP_LIBRARIES})
-
-set (SYS_DLLS c:/msys64/mingw64/bin/libgmp-10.dll)
+set (SYS_DLLS ${GMP_LIBRARIES}  c:/msys64/mingw64/bin/libgmp-10.dll)
 
 endif()
 
diff --git a/packages/python/swig/setup.py b/packages/python/swig/setup.py
index 254eeb458..53ad044b5 100644
--- a/packages/python/swig/setup.py
+++ b/packages/python/swig/setup.py
@@ -3,6 +3,8 @@
 See:
 https://packaging.python.org/en/latest/distributing.html
 https://github.com/pypa/sampleproject
+
+
 """
 
 # Always prefer setuptools over distutils
diff --git a/pl/modules.yap b/pl/modules.yap
index 96338b001..40957da24 100644
--- a/pl/modules.yap
+++ b/pl/modules.yap
@@ -789,4 +789,4 @@ module_state :-
 	fail.
 module_state.
 
-// @}
\ No newline at end of file
+%% @}
\ No newline at end of file