diff --git a/CMakeLists.txt b/CMakeLists.txt
index d26747fd7..f144a8169 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.20)
 
 set(C3_LLVM_MIN_VERSION 17)
 set(C3_LLVM_MAX_VERSION 22)
-set(C3_LLVM_DEFAULT_VERSION 19)
+set(C3_LLVM_DEFAULT_VERSION 21)
 
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
     message(FATAL_ERROR "In-tree build detected, please build in a separate directory")
@@ -57,7 +57,7 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 17)
 
 # Use /MT or /MTd
-set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
+set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")
 
 if(MSVC)
     message(STATUS "MSVC version ${MSVC_VERSION}")
@@ -435,9 +435,7 @@ if(C3_WITH_LLVM)
     target_compile_definitions(c3c PUBLIC LLVM_AVAILABLE=1)
     add_library(c3c_wrappers STATIC wrapper/src/wrapper.cpp)
     if (MSVC)
-        target_compile_options(c3c PRIVATE
-                "$<$<CONFIG:Debug>:/EHa>"
-                "$<$<CONFIG:Release>:/EHsc>")
+        target_compile_options(c3c PRIVATE "/EHsc")
     endif()
 else()
     target_sources(c3c PRIVATE src/utils/hostinfo.c)