diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
index 784784b4..62d986cc 100644
--- a/.github/workflows/build-pr.yml
+++ b/.github/workflows/build-pr.yml
@@ -13,10 +13,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: "windows msvc (core subset)"
+          - name: "windows msvc"
             os: windows-latest
-            target: scxt-core
-            cmakeConfig: -A x64
+            target: shortcircuit-products
+            cmakeConfig: -G"Visual Studio 17 2022" -A x64
             runTests: false
             clapValidate: false
 
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index a1ad9e65..059e3b23 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -21,9 +21,9 @@ jobs:
             name: windows-x86
             cmakeArgs: -GNinja -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang
 
-          #- os: windows-latest
-          #  name: windows-arm64ec
-          #  cmakeArgs: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10
+          - os: windows-latest
+            name: windows-arm64ec
+            cmakeArgs: -G"Visual Studio 17 2022" -A arm64ec -DCMAKE_SYSTEM_VERSION=10
 
           - os: macos-latest
             name: macos
diff --git a/clients/clap-first/CMakeLists.txt b/clients/clap-first/CMakeLists.txt
index 9ecd16e7..3d5865ad 100644
--- a/clients/clap-first/CMakeLists.txt
+++ b/clients/clap-first/CMakeLists.txt
@@ -9,6 +9,8 @@ add_library(${IMPL_TARGET} STATIC
         scxt-plugin/scxt-clap-entry-impl.cpp
 )
 
+target_link_libraries(${IMPL_TARGET} PRIVATE fmt)
+
 target_link_libraries(${IMPL_TARGET} PUBLIC
         clap_juce_shim_headers
         scxt-core
@@ -90,12 +92,13 @@ else()
     set_target_properties(${SA_TARGET} PROPERTIES
             OUTPUT_NAME ${name})
     target_sources(${SA_TARGET} PRIVATE scxt-juce-standalone/scxt-juce-standalone.cpp)
-    target_link_libraries(${SA_TARGET} PRIVATE ${IMPL_TARGET} juce::juce_audio_devices juce::juce_audio_utils)
+    target_link_libraries(${SA_TARGET} PRIVATE ${IMPL_TARGET} fmt juce::juce_audio_devices juce::juce_audio_utils)
     target_compile_definitions(${SA_TARGET} PRIVATE
             JUCE_ALSA=$<IF:$<BOOL:${SCXT_USE_ALSA}>,1,0>
             JUCE_JACK=$<IF:$<BOOL:${SCXT_USE_JACK}>,1,0>
             JUCE_USE_FLAC=0)
     set_target_properties(${SA_TARGET} PROPERTIES UNITY_BUILD FALSE)
+
 endif()
 
 set(ALL_TARGET ${PROJECT_NAME}_all)
diff --git a/src-ui/CMakeLists.txt b/src-ui/CMakeLists.txt
index ca8dbc30..3b716ac4 100644
--- a/src-ui/CMakeLists.txt
+++ b/src-ui/CMakeLists.txt
@@ -66,14 +66,15 @@ cmrc_add_resource_library(scxtui_json_layouts
 set_target_properties(scxtui_json_layouts PROPERTIES UNITY_BUILD FALSE)
 
 
+target_link_libraries(${PROJECT_NAME} PRIVATE
+        fmt
+        sst-plugininfra::strnatcmp
+        scxt-resources
+        scxtui_json_layouts
+)
 target_link_libraries(${PROJECT_NAME} PUBLIC
         scxt-core
-        scxt-resources
         sst-jucegui
-
-        sst-plugininfra::strnatcmp
-
-        scxtui_json_layouts
         )
 
 if (NOT CMAKE_UNITY_BUILD)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 857df8cc..fdd28022 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -68,9 +68,8 @@ else ()
 endif ()
 
 target_include_directories(${PROJECT_NAME} PUBLIC .)
+target_link_libraries(${PROJECT_NAME} PRIVATE fmt)
 target_link_libraries(${PROJECT_NAME} PUBLIC
-        fmt
-
         eurorack
 
         sst-cpputils
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index ea2c74c9..fb0ecdd9 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -6,6 +6,7 @@ add_executable(scxt-test
 		sample_analytics.cpp)
 
 target_link_libraries(scxt-test
+		fmt
         scxt-core
         shortcircuit::catch2
         )