diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42bc8912..426cd63a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,7 @@ SET(POLYVOX_VERSION_MAJOR "0")
 SET(POLYVOX_VERSION_MINOR "1")
 SET(POLYVOX_VERSION_PATCH "0")
 SET(POLYVOX_VERSION "${POLYVOX_VERSION_MAJOR}.${POLYVOX_VERSION_MINOR}.${POLYVOX_VERSION_PATCH}" CACHE STRING "PolyVox version")
+MARK_AS_ADVANCED(FORCE POLYVOX_VERSION)
 
 include(FeatureSummary)
 
@@ -55,7 +56,8 @@ INCLUDE(Packaging.cmake)
 OPTION(ENABLE_TESTS "Should the tests be built" ON)
 IF(ENABLE_TESTS)
 	INCLUDE(CTest)
-	MARK_AS_ADVANCED(FORCE DART_TESTING_TIMEOUT) #This is only needed to hide the variable in the GUI (CMake bug)
+	MARK_AS_ADVANCED(FORCE DART_TESTING_TIMEOUT) #This is only needed to hide the variable in the GUI (CMake bug) until 2.8.5
+	MARK_AS_ADVANCED(FORCE BUILD_TESTING)
 	ADD_SUBDIRECTORY(tests)
 ENDIF(ENABLE_TESTS)
 
diff --git a/library/bindings/CMakeLists.txt b/library/bindings/CMakeLists.txt
index b7d76df7..128a2347 100644
--- a/library/bindings/CMakeLists.txt
+++ b/library/bindings/CMakeLists.txt
@@ -1,11 +1,12 @@
 option(ENABLE_BINDINGS "Build Python bindings" ON)
 if(ENABLE_BINDINGS)
 	find_package(SWIG)
+	mark_as_advanced(SWIG_DIR SWIG_VERSION)
 	set_package_properties(SWIG PROPERTIES DESCRIPTION "Bindings generator" URL http://www.swig.org)
 	find_package(PythonLibs)
 	set_package_properties(PythonLibs PROPERTIES DESCRIPTION "Programming language" URL http://www.python.org)
 	if(SWIG_FOUND AND PYTHONLIBS_FOUND)
-		set(BUILD_BINDINGS ON CACHE BOOL "Will the bindings be built" FORCE)
+		set(BUILD_BINDINGS ON CACHE BOOL "Will the bindings be built" FORCE )
 		include(${SWIG_USE_FILE})
 		
 		include_directories(${PYTHON_INCLUDE_PATH})
@@ -23,3 +24,4 @@ if(ENABLE_BINDINGS)
 else()
 	set(BUILD_BINDINGS OFF CACHE BOOL "Will the bindings be built" FORCE)
 endif()
+mark_as_advanced(FORCE BUILD_BINDINGS)