diff --git a/CMakePresets.json b/CMakePresets.json
index 49cf38236310b7fcb3ae909e90e3bbd12e4260c2..d3bf97e4090df7dd38bfb08289aae77b61fc1e7a 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -16,7 +16,8 @@
       "hidden": true,
       "inherits": "_binary_dir",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_CONFIGURATION_TYPES": "Release"
       }
     },
     {
@@ -24,7 +25,8 @@
       "hidden": true,
       "inherits": "_binary_dir",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
+        "CMAKE_BUILD_TYPE": "Debug",
+        "CMAKE_CONFIGURATION_TYPES": "Debug"
       }
     },
     {
@@ -266,17 +268,20 @@
     {
       "name": "msvc-release",
       "inherits": "_win",
-      "configurePreset": "msvc-release"
+      "configurePreset": "msvc-release",
+      "configuration": "Release"
     },
     {
       "name": "msvc-debug",
       "inherits": "_win",
-      "configurePreset": "msvc-debug"
+      "configurePreset": "msvc-debug",
+      "configuration": "Debug"
     },
     {
       "name": "msvc-release-gui",
       "inherits": "_win",
       "configurePreset": "msvc-release-gui",
+      "configuration": "Release",
       "targets": [
         "DataExplorer"
       ]
@@ -285,6 +290,7 @@
       "name": "msvc-debug-gui",
       "inherits": "_win",
       "configurePreset": "msvc-debug-gui",
+      "configuration": "Debug",
       "targets": [
         "DataExplorer"
       ]
@@ -375,6 +381,7 @@
     {
       "name": "msvc-release",
       "configurePreset": "msvc-release",
+      "configuration": "Release",
       "inherits": [
         "release"
       ]
@@ -382,6 +389,7 @@
     {
       "name": "msvc-release-large",
       "configurePreset": "msvc-release",
+      "configuration": "Release",
       "inherits": [
         "release-large"
       ]
diff --git a/MaterialLib/SolidModels/Ehlers.h b/MaterialLib/SolidModels/Ehlers.h
index 1bd2e510814396cf3509f44c3f4a3b7a9ae409f6..00574f0a783295a33e0b547ea68927f02a281ca1 100644
--- a/MaterialLib/SolidModels/Ehlers.h
+++ b/MaterialLib/SolidModels/Ehlers.h
@@ -260,8 +260,7 @@ struct StateVariables
            << "eps_p_D_prev: " << m.eps_p_prev.D << "\n"
            << "eps_p_eff_prev: " << m.eps_p_prev.eff << "\n"
            << "kappa_d_prev: " << m.damage_prev.kappa_d() << "\n"
-           << "damage_prev: " << m.damage_prev.value() << "\n"
-           << "lambda: " << m.lambda << "\n";
+           << "damage_prev: " << m.damage_prev.value() << "\n";
         return os;
     }
 #endif  // NDEBUG
diff --git a/scripts/ci/jobs/build-linux.yml b/scripts/ci/jobs/build-linux.yml
index 687163158af5dd6e2bbc3129da4f800fddf67bb7..a7094824dc3fc38a6d0bd9fbaae07aed69fe5760 100644
--- a/scripts/ci/jobs/build-linux.yml
+++ b/scripts/ci/jobs/build-linux.yml
@@ -96,6 +96,7 @@ build linux debug with sanitizers:
       -DOGS_UNDEFINED_BEHAVIOR_SANITIZER=ON
       -DOGS_CTEST_MAX_RUNTIME=5
       -DOGS_BUILD_PYTHON_MODULE=OFF
+      -DOGS_USE_PIP=ON
     UBSAN_OPTIONS: "print_stacktrace=1"
     LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/scripts/test/leak_sanitizer.suppressions"
 
diff --git a/scripts/ci/jobs/build-win.yml b/scripts/ci/jobs/build-win.yml
index 948af6adf9da3821cde185a84be07f404798cfdf..196c5f5172a484dcf2827b9af92c7196bca868f5 100644
--- a/scripts/ci/jobs/build-win.yml
+++ b/scripts/ci/jobs/build-win.yml
@@ -19,3 +19,18 @@ build win:
   parallel:
     matrix:
       - USE_PYTHON: ["USE_PYTHON=ON", "USE_PYTHON=OFF"]
+
+build win msvc:
+  extends: .template-build-win
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+    - if: $CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/
+    - when: manual
+      allow_failure: true
+  variables:
+    CMAKE_PRESET: msvc-release
+    BUILD_TESTS: "false"
+    BUILD_CTEST: "false"
+    CMAKE_ARGS: >-
+      -DOGS_CI_TESTRUNNER_REPEAT=1
+      -DOGS_BUILD_PROCESSES=SteadyStateDiffusion
diff --git a/scripts/cmake/BuildExternalProject.cmake b/scripts/cmake/BuildExternalProject.cmake
index 5696672a221435a89c63f51f9257aa7c460b738a..964e394b56222cd8269766198c1ab04afd4fa36e 100644
--- a/scripts/cmake/BuildExternalProject.cmake
+++ b/scripts/cmake/BuildExternalProject.cmake
@@ -90,8 +90,8 @@ endfunction()
 
 function(BuildExternalProject_build build_dir)
     execute_process(
-        COMMAND ${CMAKE_COMMAND} --build . RESULT_VARIABLE result
-        WORKING_DIRECTORY ${build_dir}
+        COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
+        RESULT_VARIABLE result WORKING_DIRECTORY ${build_dir}
     )
 
     if(result)
diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake
index 9d3f4de6d25fc8598aa605b8d4a6718550ffdb9f..e404b39089d2d3d42ba4465c6408710267d037a7 100644
--- a/scripts/cmake/DependenciesExternalProject.cmake
+++ b/scripts/cmake/DependenciesExternalProject.cmake
@@ -312,7 +312,8 @@ elseif(NOT OGS_BUILD_VTK AND NOT OGS_USE_MKL)
 endif()
 if(NOT VTK_FOUND)
 
-    if("${OGS_EXTERNAL_DEPENDENCIES_CACHE}" STREQUAL "")
+    if("${OGS_EXTERNAL_DEPENDENCIES_CACHE}" STREQUAL "" AND
+      NOT EXISTS "${PROJECT_BINARY_DIR}/_ext/VTK/src/VTK")
         # Fixes https://stackoverflow.com/questions/9894961 on vismac05:
         set(_loguru_patch PATCH_COMMAND git apply
                           "${PROJECT_SOURCE_DIR}/scripts/cmake/loguru.patch"
diff --git a/scripts/cmake/packaging/Pack.cmake b/scripts/cmake/packaging/Pack.cmake
index 452de7d981158588f8bffa8e34bcaf84f5a9a1d0..559f9c762ad97de1e1cdc1217e5f020731843095 100644
--- a/scripts/cmake/packaging/Pack.cmake
+++ b/scripts/cmake/packaging/Pack.cmake
@@ -94,6 +94,6 @@ install(FILES ${PROJECT_BINARY_DIR}/README.txt DESTINATION .)
 install(FILES ${PROJECT_BINARY_DIR}/CMakeCache.txt TYPE INFO)
 install(FILES ${PROJECT_BINARY_DIR}/cmake_args TYPE INFO OPTIONAL)
 install(
-    CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR} -t write-licenses)"
+    CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build ${PROJECT_BINARY_DIR} --config ${CMAKE_BUILD_TYPE} -t write-licenses)"
 )
 install(FILES ${PROJECT_BINARY_DIR}/third_party_licenses.txt TYPE INFO)