diff --git a/CMakeLists.txt b/CMakeLists.txt
index e23907be0..846273523 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,7 +130,7 @@ SET(${PROJECT_NAME}_SOURCES
 )
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_HEADERS})
-TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj>)
+TARGET_COMPILE_OPTIONS(${PROJECT_NAME} PRIVATE $<$<CXX_COMPILER_ID:MSVC>:-bigobj> "-Wno-conversion")
 
 TARGET_LINK_BOOST_PYTHON(${PROJECT_NAME})
 PKG_CONFIG_USE_DEPENDENCY(${PROJECT_NAME} eigen3)
diff --git a/cmake b/cmake
index 46dc4a575..8e01cbbb0 160000
--- a/cmake
+++ b/cmake
@@ -1 +1 @@
-Subproject commit 46dc4a57521bde14ea75c959b6b4f887af50c65d
+Subproject commit 8e01cbbb07722838d69d098ae6abb4211fae1737
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 81c1a3530..84422c361 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -26,6 +26,9 @@ MAKE_DIRECTORY("${${PROJECT_NAME}_BINARY_DIR}/python/${PROJECT_NAME}")
 ADD_LIBRARY(${PYWRAP} SHARED main.cpp)
 TARGET_LINK_LIBRARIES(${PYWRAP} ${PROJECT_NAME}) 
 TARGET_LINK_BOOST_PYTHON(${PYWRAP})
+# BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS spews conversion warnings from int to long unsigned int.
+# Unfortunately, using literals does not work in a macro. As such, this turns them off for the entire wrapper:
+TARGET_COMPILE_OPTIONS(${PYWRAP} PRIVATE "-Wno-conversion")
 #IF(BUILD_WITH_COMMIT_VERSION)
 #  TAG_LIBRARY_VERSION(${PYWRAP})
 #ENDIF(BUILD_WITH_COMMIT_VERSION)