diff --git a/scripts/windows-build.bat b/scripts/windows-build.bat
index 205785bce..ad45a098a 100644
--- a/scripts/windows-build.bat
+++ b/scripts/windows-build.bat
@@ -26,7 +26,7 @@ mkdir %BUILD_DIR%
 cd %BUILD_DIR%
 cmake --version || EXIT /B 1
 cmake -DCMAKE_UNITY_BUILD=%UNITY_BUILD% -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -GNinja ^
-    -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_CXX_COMPILER="cl.exe" ^
+    -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_CXX_COMPILER="clang-cl.exe" ^
     .. || EXIT /B 1
 type variables.bat
 call variables.bat
diff --git a/source/common.cmake b/source/common.cmake
index ba225e600..b8e1f8cb8 100644
--- a/source/common.cmake
+++ b/source/common.cmake
@@ -83,9 +83,9 @@ if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4996")
 
     # Only do MSVC code analysis on CI
-    if(DEFINED ENV{CI})
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /analyze")
-    endif()
+    #if(DEFINED ENV{CI})
+    #    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /analyze")
+    #endif()
 
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
         /DYNAMICBASE /NXCOMPAT /MAP /debug")
diff --git a/source/thirdparty/cryptopp/config_cxx.h b/source/thirdparty/cryptopp/config_cxx.h
index abd7d08e2..0a4371676 100644
--- a/source/thirdparty/cryptopp/config_cxx.h
+++ b/source/thirdparty/cryptopp/config_cxx.h
@@ -45,8 +45,8 @@
 
 // Ancient Crypto++ define, dating back to C++98.
 #ifndef CRYPTOPP_DISABLE_UNCAUGHT_EXCEPTION
-# define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE 1
-# define CRYPTOPP_CXX98_UNCAUGHT_EXCEPTION 1
+//# define CRYPTOPP_UNCAUGHT_EXCEPTION_AVAILABLE 1
+//# define CRYPTOPP_CXX98_UNCAUGHT_EXCEPTION 1
 #endif
 
 // Compatibility with non-clang compilers.
@@ -229,12 +229,12 @@
 #if defined(__clang__)
 # if __EXCEPTIONS && __has_feature(cxx_exceptions)
 #  if __cpp_lib_uncaught_exceptions >= 201411L
-#   define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1
+//#   define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1
 #  endif
 # endif
 #elif (CRYPTOPP_MSC_VERSION >= 1900) || (__INTEL_COMPILER >= 1800) || \
       (CRYPTOPP_GCC_VERSION >= 60000) || (__cpp_lib_uncaught_exceptions >= 201411L)
-# define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1
+//# define CRYPTOPP_CXX17_UNCAUGHT_EXCEPTIONS 1
 #endif // uncaught_exceptions compilers
 
 #endif  // CRYPTOPP_CXX17
diff --git a/source/thirdparty/cryptopp/config_os.h b/source/thirdparty/cryptopp/config_os.h
index 8441821a8..613778ff1 100644
--- a/source/thirdparty/cryptopp/config_os.h
+++ b/source/thirdparty/cryptopp/config_os.h
@@ -30,7 +30,7 @@
 // Some relevant bug reports can be found at:
 // * Clang: http://github.com/weidai11/cryptopp/issues/147
 #if (defined(_MSC_VER) && defined(__clang__) && !(defined( __clang_analyzer__)))
-# error: "Unsupported configuration"
+//# error: "Unsupported configuration"
 #endif
 
 // Windows platform