diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56b92316..91459f5f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ if(UNIX)
 elseif(MSVC)
 	# Skip warning for invalid conversion from size_t to uint32_t for all targets below for now
 	# Also disable non-portable MSVC volatile behavior
-	add_compile_options("/wd4267" "/utf-8" "/volatile:iso")
+	add_compile_options("/wd4267" "/utf-8" "/volatile:iso" "/Zc:inline")
 elseif(WIN32)
 	add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
diff --git a/CMakePresets.json b/CMakePresets.json
index 63f59c7a..d1fd8c5c 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -10,7 +10,7 @@
       "name": "default",
       "displayName": "Default configure step",
       "description": "Use 'build' dir and Unix makefiles",
-      "binaryDir": "${sourceDir}/build/default",
+      "binaryDir": "${sourceDir}/build",
       "generator": "Unix Makefiles"
     },
     {
@@ -50,9 +50,6 @@
         "type": "equals",
         "lhs": "${hostSystemName}",
         "rhs": "Windows"
-      },
-      "cacheVariables": {
-        "CMAKE_CXX_FLAGS_INIT": "/Zc:inline"
       }
     },
     {