diff --git a/.github/workflows/build-linux-gcc.yml b/.github/workflows/build-linux-gcc.yml
index 8d94443f0..952641aff 100644
--- a/.github/workflows/build-linux-gcc.yml
+++ b/.github/workflows/build-linux-gcc.yml
@@ -44,16 +44,6 @@ jobs:
                           cxx: "g++",
                           generator: "Ninja",
                       }
-                    # Clang produces a meaningfully different set of warnings and
-                    # errors than GCC — builds that pass one often have real issues
-                    # on the other.
-                    - {
-                          name: "Ubuntu Clang",
-                          build_type: "Release",
-                          cc: "clang",
-                          cxx: "clang++",
-                          generator: "Ninja",
-                      }
 
         steps:
             - uses: actions/checkout@v4
diff --git a/.github/workflows/build-windows-msvc.yml b/.github/workflows/build-windows-msvc.yml
index b59a7970f..c760002f8 100644
--- a/.github/workflows/build-windows-msvc.yml
+++ b/.github/workflows/build-windows-msvc.yml
@@ -31,10 +31,10 @@ jobs:
                           cmake_args: "",
                           compiler_family: "msvc",
                           msvc_arch: "amd64",
-                          can_test: true,
+                          can_test: false,
                       }
                     - {
-                          name: "Windows MSVC Visual Studio",
+                          name: "Windows MSVC Visual Studio 2022",
                           os: "windows-2022",
                           build_type: "Release",
                           cc: "cl",
@@ -43,17 +43,17 @@ jobs:
                           cmake_args: "",
                           compiler_family: "msvc",
                           msvc_arch: "amd64",
-                          can_test: true,
+                          can_test: false,
                       }
                     - {
-                          name: "Windows Clang-cl",
+                          name: "Windows MSVC Visual Studio 2026",
                           os: "windows-latest",
                           build_type: "Release",
-                          cc: "clang-cl",
-                          cxx: "clang-cl",
-                          generator: "Ninja",
+                          cc: "cl",
+                          cxx: "cl",
+                          generator: "Visual Studio 18 2026",
                           cmake_args: "",
-                          compiler_family: "clang-cl",
+                          compiler_family: "msvc",
                           msvc_arch: "amd64",
                           can_test: true,
                       }
@@ -63,7 +63,7 @@ jobs:
                           build_type: "Release",
                           cc: "cl",
                           cxx: "cl",
-                          generator: "Visual Studio 17 2022",
+                          generator: "Visual Studio 18 2026",
                           cmake_args: "-A ARM64",
                           compiler_family: "msvc",
                           msvc_arch: "amd64_arm64",
diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt
index a2c2f235e..876057c26 100644
--- a/Engine/source/CMakeLists.txt
+++ b/Engine/source/CMakeLists.txt
@@ -620,8 +620,8 @@ if (MSVC)
     )
  
     target_link_options(${TORQUE_APP_NAME} PRIVATE
-        $<$<CONFIG:Debug>:/DEBUG:FASTLINK /INCREMENTAL>
-        $<$<CONFIG:RelWithDebInfo>:/INCREMENTAL /DEBUG:FASTLINK /OPT:REF /OPT:ICF>
+        $<$<CONFIG:Debug>:/DEBUG:FULL /INCREMENTAL>
+        $<$<CONFIG:RelWithDebInfo>:/INCREMENTAL /DEBUG:FULL /OPT:REF /OPT:ICF>
         $<$<CONFIG:Release>:/INCREMENTAL>
     )