diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69355a820e..f07224ee5d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,6 +32,12 @@ elseif (MSVC)
     add_compile_options(/MP)
     if (NOT DUSK_BUILD_WARNINGS)
         add_compile_options(/W0)
+    else ()
+        # Disable warnings
+        add_compile_options(/wd4068) # unknown pragma
+        add_compile_options(/wd4291) # no matching delete operator, leaks if exception thrown
+        # Only show warnings once
+        add_compile_options(/wo4244) # narrowing conversion, possible data loss
     endif ()
     add_compile_options(/utf-8)
 endif ()
diff --git a/include/JSystem/JGeometry.h b/include/JSystem/JGeometry.h
index 773195392e..82801b5603 100644
--- a/include/JSystem/JGeometry.h
+++ b/include/JSystem/JGeometry.h
@@ -7,8 +7,10 @@
 
 #ifndef __MWERKS__
 #include <limits>
+#if !defined(FLT_EPSILON)
 #define FLT_EPSILON std::numeric_limits<float>::epsilon()
 #endif
+#endif
 
 namespace JGeometry {