diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index e9d29561121..2adeb573f06 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -106,10 +106,6 @@ add_definitions(
 	-DNEWDIRVELMOTEST=0
 )
 
-if(WINDOWS)
-	add_definitions(-DUSE_MSVC6FIXES)
-endif()
-
 if(WITH_OPENMP)
 	add_definitions(-DPARALLEL=1)
 else()
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 529aaac4923..391fdf42d28 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -28,9 +28,5 @@ add_subdirectory(blender)
 if(WITH_GAMEENGINE)
 	add_subdirectory(gameengine)
 endif()
-	
-if(WINDOWS)
-	add_subdirectory(icons)
-endif()
 
 add_subdirectory(tests)
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index a1cb360e0a4..7b7d20a54e0 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -3392,13 +3392,11 @@ static void shrinkwrap_get_tarmat(bConstraint *con, bConstraintOb *cob, bConstra
 					if (scon->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Y_AXIS) no[1] = 1.0f;
 					if (scon->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) no[2] = 1.0f;
 					
-					if (dot_v3v3(no, no) < FLT_EPSILON) {
+					if (normalize_v3(no) < FLT_EPSILON) {
 						fail = TRUE;
 						break;
 					}
 					
-					normalize_v3(no);
-					
 					
 					bvhtree_from_mesh_faces(&treeData, target, scon->dist, 4, 6);
 					if (treeData.tree == NULL) {