diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f91531f8..def3b71f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,14 +42,14 @@ IF (USE_CUSTOM_VECTOR_MATH)
 	ENDIF(WIN32)
 ENDIF(USE_CUSTOM_VECTOR_MATH)
 
-IF (WIN32)
+IF (MSVC)
 	FIND_PATH(DIRECTX_SDK_BASE_DIR Include/D3D11.h PATH  $ENV{DXSDK_DIR} )
 	IF(DIRECTX_SDK_BASE_DIR)
 		OPTION(USE_DX11 "Use DirectX 11"	ON)
 	ELSE()
 		OPTION(USE_DX11 "Use DirectX 11"	OFF)
 	ENDIF()
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 
 #SET(CMAKE_EXE_LINKER_FLAGS_INIT    "/STACK:10000000 /INCREMENTAL:NO")	
@@ -120,7 +120,7 @@ ENDIF()
 OPTION(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES "Create MSVC projectfiles with relative paths" OFF)
 OPTION(INTERNAL_ADD_POSTFIX_EXECUTABLE_NAMES "Add MSVC postfix for executable names (_Debug)" OFF)
 
-IF(WIN32)
+IF(MSVC)
 	FIND_PATH(AMD_OPENCL_BASE_DIR include/CL/cl.h PATH  $ENV{ATISTREAMSDKROOT} )
 	IF(AMD_OPENCL_BASE_DIR)
 		OPTION(BUILD_AMD_OPENCL_DEMOS "Build OpenCL demos for AMD (GPU or CPU)"	ON)
@@ -162,7 +162,7 @@ ENDIF(INTERNAL_CREATE_MSVC_RELATIVE_PATH_PROJECTFILES)
 
 ENDIF (WIN32)
 
-IF (WIN32 OR APPLE)
+IF (MSVC OR APPLE)
 	OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)"  ON)
 ELSE()
 	OPTION(BUILD_MINICL_OPENCL_DEMOS "Build OpenCL demos for MiniCL (Generic CPU)" OFF)
diff --git a/Demos/OpenGL/GLDebugFont.cpp b/Demos/OpenGL/GLDebugFont.cpp
index 8dcb040f4..b62973182 100644
--- a/Demos/OpenGL/GLDebugFont.cpp
+++ b/Demos/OpenGL/GLDebugFont.cpp
@@ -40,6 +40,7 @@ subject to the following restrictions:
 #include <GL/gl.h>
 #include <GL/glu.h>
 #else
+#include <GL/gl.h>
 #include <GL/glut.h>
 #endif
 #endif
diff --git a/Demos/OpenGL/GL_DialogWindow.h b/Demos/OpenGL/GL_DialogWindow.h
index fb18ffb9f..75cb04e75 100644
--- a/Demos/OpenGL/GL_DialogWindow.h
+++ b/Demos/OpenGL/GL_DialogWindow.h
@@ -33,11 +33,12 @@ class btCollisionObject;
 #else
 
 
-#ifdef _WINDOWS
+#ifdef _WIN32
 #include <windows.h>
 #include <GL/gl.h>
 #include <GL/glu.h>
 #else
+#include <GL/gl.h>
 #include <GL/glut.h>
 #endif
 #endif
diff --git a/Demos/OpenGL/GlutStuff.h b/Demos/OpenGL/GlutStuff.h
index 10d357641..0f618be8b 100644
--- a/Demos/OpenGL/GlutStuff.h
+++ b/Demos/OpenGL/GlutStuff.h
@@ -33,6 +33,7 @@ subject to the following restrictions:
 #include <GL/gl.h>
 #include <GL/glu.h>
 #else
+#include <GL/gl.h>
 #include <GL/glut.h>
 #endif //_WINDOWS
 #endif //APPLE
diff --git a/Demos/SharedOpenCL/btOclUtils.cpp b/Demos/SharedOpenCL/btOclUtils.cpp
index 6e0823227..1ce0b9526 100644
--- a/Demos/SharedOpenCL/btOclUtils.cpp
+++ b/Demos/SharedOpenCL/btOclUtils.cpp
@@ -130,18 +130,11 @@ char* btOclLoadProgSource(const char* cFilename, const char* cPreamble, size_t*
     size_t szSourceLength;
 
     // open the OpenCL source code file
-    #ifdef _WIN32   // Windows version
-        if(fopen_s(&pFileStream, cFilename, "rb") != 0) 
-        {       
-            return NULL;
-        }
-    #else           // Linux version
-        pFileStream = fopen(cFilename, "rb");
-        if(pFileStream == 0) 
-        {       
-            return NULL;
-        }
-    #endif
+	pFileStream = fopen(cFilename, "rb");
+	if(pFileStream == 0) 
+	{       
+		return NULL;
+	}
 
     size_t szPreambleLength = strlen(cPreamble);
 
diff --git a/Demos/VectorAdd_OpenCL/MiniCL_VectorAdd.cpp b/Demos/VectorAdd_OpenCL/MiniCL_VectorAdd.cpp
index e838c6768..cebbb7572 100644
--- a/Demos/VectorAdd_OpenCL/MiniCL_VectorAdd.cpp
+++ b/Demos/VectorAdd_OpenCL/MiniCL_VectorAdd.cpp
@@ -45,18 +45,11 @@ char* loadProgSource(const char* cFilename, const char* cPreamble, size_t* szFin
     size_t szSourceLength;
 	
     // open the OpenCL source code file
-#ifdef _WIN32   // Windows version
-	if(fopen_s(&pFileStream, cFilename, "rb") != 0) 
-	{       
-		return NULL;
-	}
-#else           // Linux version
 	pFileStream = fopen(cFilename, "rb");
 	if(pFileStream == 0) 
 	{       
 		return NULL;
 	}
-#endif
 	
     size_t szPreambleLength = strlen(cPreamble);
 	
diff --git a/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp b/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp
index dad166b6b..420f15f15 100644
--- a/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp
+++ b/src/BulletMultiThreaded/SpuGatheringCollisionDispatcher.cpp
@@ -130,8 +130,8 @@ public:
 					int	proxyType0 = colObj0->getCollisionShape()->getShapeType();
 					int	proxyType1 = colObj1->getCollisionShape()->getShapeType();
 					bool supportsSpuDispatch = m_dispatcher->supportsDispatchPairOnSpu(proxyType0,proxyType1) 
-						&& (colObj0->getCollisionFlags() != btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) 
-						&& (colObj1->getCollisionFlags() != btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING);
+						&& ((colObj0->getCollisionFlags() & btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) == 0)
+						&& ((colObj1->getCollisionFlags() & btCollisionObject::CF_DISABLE_SPU_COLLISION_PROCESSING) == 0);
 
 					if (proxyType0 == COMPOUND_SHAPE_PROXYTYPE)
 					{