diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c20979d4..365365701 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,7 +66,8 @@ endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
   # Manually tweak MSVC to emit (about) the same warnings as clang and gcc on linux
-  add_compile_options("/permissive-" /wd4267 /wd4244 /wd4244 /wd4305 /wd4805 /wd4267 /wd4646 /wd4065 "/Dand=&&" "/Dor=||" "/Dnot=!")
+  add_compile_options("/permissive-" /wd4267 /wd4244 /wd4244 /wd4305 /wd4805 /wd4267 /wd4646 /wd4065 /Dand=&& /Dor=|| /Dnot=!)
+  add_compile_definitions(NOMINMAX)
 endif()
 
 set(FSFW_SOURCES_DIR "${CMAKE_SOURCE_DIR}/src/fsfw")
@@ -478,7 +479,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  set(FSFW_WARNING_FLAGS -Weverything -Wno-gnu-anonymous-struct)
+  set(FSFW_WARNING_FLAGS -Wall -Wno-gnu-anonymous-struct)
 endif()
 
 # Required include paths to compile the FSFW