diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca08f5a19..d88eb378f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,18 +39,20 @@ IF(MSVC)
 	IF (NOT USE_MSVC_INCREMENTAL_LINKING)
 		#MESSAGE("MSVC_INCREMENTAL_DEFAULT"+${MSVC_INCREMENTAL_DEFAULT})
 		SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:NO")
-		 
+	
 		STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags ${CMAKE_EXE_LINKER_FLAGS_DEBUG}) 
 		SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/INCREMENTAL:NO ${replacementFlags}" )
 		MESSAGE("CMAKE_EXE_LINKER_FLAGS_DEBUG=${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
 	
 		STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags2 ${CMAKE_EXE_LINKER_FLAGS}) 
+		
 		SET(CMAKE_EXE_LINKER_FLAGS ${replacementFlag2}) 
-		STRING(REPLACE "INCREMENTAL:YES" "" replacementFlags3 ${CMAKE_EXTRA_LINK_FLAGS}) 
+		STRING(REPLACE "INCREMENTAL:YES" "" replacementFlags3 "${CMAKE_EXTRA_LINK_FLAGS}") 
+
 		SET(CMAKE_EXTRA_LINK_FLAGS ${replacementFlag3}) 
 		
 		
-		STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags3 ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO})
+		STRING(REPLACE "INCREMENTAL:YES" "INCREMENTAL:NO" replacementFlags3 "${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO}")
 		SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO ${replacementFlags3}) 
 		SET(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO "/INCREMENTAL:NO ${replacementFlags3}" )
 	
@@ -179,8 +181,8 @@ ENDIF (OPENGL_FOUND)
 
 
 
-OPTION(BUILD_OBSOLETE_DEMOS "Set when you want to build the obsolete Bullet 2 demos" ON)
-IF(BUILD_OBSOLETE_DEMOS)
+OPTION(BUILD_BULLET2_DEMOS "Set when you want to build the Bullet 2 demos" ON)
+IF(BUILD_BULLET2_DEMOS)
 
 IF (USE_GLUT)
 	IF (MSVC)
@@ -222,7 +224,7 @@ ENDIF(USE_GLUT)
 	IF(EXISTS ${BULLET_PHYSICS_SOURCE_DIR}/Demos AND IS_DIRECTORY ${BULLET_PHYSICS_SOURCE_DIR}/Demos)
 		SUBDIRS(Demos)
 	ENDIF()
-ENDIF(BUILD_OBSOLETE_DEMOS)
+ENDIF(BUILD_BULLET2_DEMOS)
 
 OPTION(BUILD_BULLET3_DEMOS "Set when you want to build the Bullet 3 demos" ON)
 IF(BUILD_BULLET3_DEMOS)
diff --git a/Demos/BulletXmlImportDemo/CMakeLists.txt b/Demos/BulletXmlImportDemo/CMakeLists.txt
index 486b69027..175c52964 100644
--- a/Demos/BulletXmlImportDemo/CMakeLists.txt
+++ b/Demos/BulletXmlImportDemo/CMakeLists.txt
@@ -18,6 +18,7 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletXmlWorldImporter
+${GLUT_INCLUDE_DIR}
 )
 
 ADD_DEFINITIONS(-DDESERIALIZE_SOFT_BODIES)
diff --git a/Demos/ConcaveDemo/CMakeLists.txt b/Demos/ConcaveDemo/CMakeLists.txt
index f180492fa..e065ccf57 100644
--- a/Demos/ConcaveDemo/CMakeLists.txt
+++ b/Demos/ConcaveDemo/CMakeLists.txt
@@ -16,6 +16,8 @@ IF (USE_GLUT)
 	../OpenGL 
 	${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
 	${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
+	${GLUT_INCLUDE_DIR}
+
 	)
 
 	LINK_LIBRARIES(
diff --git a/Demos/ConvexDecompositionDemo/CMakeLists.txt b/Demos/ConvexDecompositionDemo/CMakeLists.txt
index 979c792bc..08045bd4f 100644
--- a/Demos/ConvexDecompositionDemo/CMakeLists.txt
+++ b/Demos/ConvexDecompositionDemo/CMakeLists.txt
@@ -19,6 +19,8 @@ ${BULLET_PHYSICS_SOURCE_DIR}/Extras/HACD
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/ConvexDecomposition
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
+${GLUT_INCLUDE_DIR}
+
 )
 
 IF (USE_GLUT)
diff --git a/Demos/SerializeDemo/CMakeLists.txt b/Demos/SerializeDemo/CMakeLists.txt
index 4a85fd275..9cf57df25 100644
--- a/Demos/SerializeDemo/CMakeLists.txt
+++ b/Demos/SerializeDemo/CMakeLists.txt
@@ -20,6 +20,8 @@ ${BULLET_PHYSICS_SOURCE_DIR}/src
 ../OpenGL
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletFileLoader
 ${BULLET_PHYSICS_SOURCE_DIR}/Extras/Serialize/BulletWorldImporter
+${GLUT_INCLUDE_DIR}
+
 )
 
 ADD_DEFINITIONS(-DDESERIALIZE_SOFT_BODIES)
diff --git a/Extras/HACD/hacdICHull.cpp b/Extras/HACD/hacdICHull.cpp
index 4f99c4d64..4ab5cfaf9 100644
--- a/Extras/HACD/hacdICHull.cpp
+++ b/Extras/HACD/hacdICHull.cpp
@@ -14,6 +14,8 @@
  */
 #include "hacdICHull.h"
 #include <limits>
+#include <algorithm>
+
 namespace HACD
 {   
 	const long ICHull::sc_dummyIndex = std::numeric_limits<long>::max();