diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cf1867f..cec28d0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -212,7 +212,7 @@ elseif(WIN32)
      ${CMAKE_BINARY_DIR}/misc/misc.wxs
      ${CMAKE_BINARY_DIR}/misc/dynamic.wxs
      )
-  string(APPEND CMAKE_CXX_FLAGS "-mwindows")
+  target_link_options(${CMAKE_PROJECT_NAME} PRIVATE -mwindows -MT$<$<CONFIG:Debug>:D>)
   install(DIRECTORY
 	  ${CMAKE_BINARY_DIR}/platforms
 	  ${CMAKE_BINARY_DIR}/sqldrivers
@@ -231,7 +231,7 @@ elseif(WIN32)
 		${OPENSSL_ROOT_DIR}/bin/libcrypto-1_1-x64.dll
 	  DESTINATION ${RUNTIME_DEST}
   )
-  install(CODE "execute_process(COMMAND cmake -E chdir ${CMAKE_INSTALL_PREFIX} tar cvf ${RUNTIME_DEST}.zip --format=zip -- ${RUNTIME_DEST})")
+  install(CODE "execute_process(COMMAND cmake -E chdir \${CMAKE_INSTALL_PREFIX} tar cvf ${RUNTIME_DEST}.zip --format=zip -- ${RUNTIME_DEST})")
   set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
 
 else()
diff --git a/misc/dynamic.wxs.in b/misc/dynamic.wxs.in
index 50955cf3..fded4b16 100644
--- a/misc/dynamic.wxs.in
+++ b/misc/dynamic.wxs.in
@@ -9,7 +9,10 @@
             <Component Id="Cvcruntime140" Guid="f0b03b2a-14f7-4631-bfe3-d4c6c9b57e1d">
                 <File Id="vcruntime140.dll" Source="@SYSTEM32@/vcruntime140.dll" KeyPath="yes"/>
             </Component>
-	    <!-- aqt install-tool windows desktop tools_vcredist qt.tools.vcredist_msvc2019_x64 -->
+	    <!-- aqt install-tool windows desktop tools_vcredist qt.tools.vcredist_msvc2019_x64
+		Copy C:\Windows\System32\vcruntime140.dll C:\Windows\WOW64\
+		The WIX system uses that one and it crashes on the target.
+	    -->
         </DirectoryRef>
         <FeatureGroup Id="DatabaseGroup">
             <Feature Id="Databases" Title="Database Drivers"