diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 3c00149..253c358 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -109,8 +109,8 @@ jobs:
           Write-Host "Submodule version: $version"
 
           foreach ($cfg in @(
-            @{ Platform = 'x64';   ZydisCfg = 'Release MD DLL'; ZydisBin = 'ReleaseX64'; Arch = 'x64'  }
-            @{ Platform = 'Win32'; ZydisCfg = 'Release MD DLL'; ZydisBin = 'ReleaseX86'; Arch = 'x86'  }
+            @{ Platform = 'x64';   SlnPlatform = 'x64'; OutDir = 'x64/Release'; ZydisCfg = 'Release MD DLL'; ZydisBin = 'ReleaseX64'; Arch = 'x64'  }
+            @{ Platform = 'Win32'; SlnPlatform = 'x86'; OutDir = 'Release';     ZydisCfg = 'Release MD DLL'; ZydisBin = 'ReleaseX86'; Arch = 'x86'  }
           )) {
             # Build Zydis DLL
             msbuild src-csharp/RDPOffsetFinder/zydis/msvc/zydis/Zydis.vcxproj `
@@ -123,15 +123,17 @@ jobs:
             # where zydis/ lives - vcxproj AdditionalIncludeDirectories and
             # AdditionalDependencies both use $(SolutionDir)\zydis\... and
             # fail with C1083 when the vcxproj is targeted directly.
+            # NB: the solution uses x86/x64 platform names (not Win32) - use SlnPlatform.
             msbuild src-csharp/RDPOffsetFinder/RDPWrapOffsetFinder.sln `
               /t:RDPWrapOffsetFinder `
               /p:Configuration=Release `
-              /p:Platform="$($cfg.Platform)" `
+              /p:Platform="$($cfg.SlnPlatform)" `
               /p:PlatformToolset=v143 `
               /v:minimal
 
             $arch   = $cfg.Arch
-            $exeSrc = "src-csharp/RDPOffsetFinder/RDPWrapOffsetFinder/$($cfg.Platform)/Release/RDPWrapOffsetFinder.exe"
+            # Win32 OutDir = Release\ (no platform prefix); x64 OutDir = x64\Release\
+            $exeSrc = "src-csharp/RDPOffsetFinder/$($cfg.OutDir)/RDPWrapOffsetFinder.exe"
             $dllSrc = "src-csharp/RDPOffsetFinder/zydis/msvc/bin/$($cfg.ZydisBin)/Zydis.dll"
             Copy-Item $exeSrc ".\RDPWrapOffsetFinder_$arch.exe"
             Copy-Item $dllSrc ".\Zydis_$arch.dll"
diff --git a/.github/workflows/build-cpp.yml b/.github/workflows/build-cpp.yml
index 0aab122..e0c2d36 100644
--- a/.github/workflows/build-cpp.yml
+++ b/.github/workflows/build-cpp.yml
@@ -7,8 +7,6 @@
 on:
   pull_request:
     branches: [main, master]
-    paths:
-      - 'src-x86-x64-Fusix/**'
   push:
     tags:
       - 'v*'
diff --git a/.github/workflows/build-csharp.yml b/.github/workflows/build-csharp.yml
index 468eae5..1d0d5e4 100644
--- a/.github/workflows/build-csharp.yml
+++ b/.github/workflows/build-csharp.yml
@@ -9,8 +9,6 @@ name: Build C# Tools
 on:
   pull_request:
     branches: [main, master]
-    paths:
-      - 'src-csharp/**'
   push:
     tags:
       - 'v*'
diff --git a/.github/workflows/build-msi-check.yml b/.github/workflows/build-msi-check.yml
index cb7e01a..1fd943a 100644
--- a/.github/workflows/build-msi-check.yml
+++ b/.github/workflows/build-msi-check.yml
@@ -7,9 +7,6 @@ name: Build MSI Check
 on:
   pull_request:
     branches: [main, master]
-    paths:
-      - 'msi/**'
-      - '.github/workflows/build-msi-check.yml'
   workflow_dispatch:
 
 env:
diff --git a/.github/workflows/build-offsetfinder.yml b/.github/workflows/build-offsetfinder.yml
index 858ef16..6dbd10c 100644
--- a/.github/workflows/build-offsetfinder.yml
+++ b/.github/workflows/build-offsetfinder.yml
@@ -7,8 +7,6 @@
 on:
   pull_request:
     branches: [main, master]
-    paths:
-      - 'src-csharp/RDPOffsetFinder/**'
   push:
     tags:
       - 'v*'
@@ -28,13 +26,15 @@ jobs:
       matrix:
         include:
           - platform: x64
+            sln_platform: x64
             zydis_cfg: "Release MD DLL"
             zydis_bin: ReleaseX64
-            finder_plat: x64
+            out_dir: x64/Release
           - platform: Win32
+            sln_platform: x86
             zydis_cfg: "Release MD DLL"
             zydis_bin: ReleaseX86
-            finder_plat: Win32
+            out_dir: Release
 
     steps:
       - name: Checkout repository (with submodules)
@@ -55,13 +55,16 @@ jobs:
             /p:PlatformToolset=v143 `
             /v:minimal
 
-      # Build the offset finder (links against the Zydis import lib just produced)
+      # Build via .sln so $(SolutionDir) resolves to the submodule root where
+      # AdditionalIncludeDirectories and AdditionalDependencies reference zydis/
+      # NB: the solution uses x86/x64 platform names (not Win32) - use sln_platform.
       - name: Build RDPWrapOffsetFinder (${{ matrix.platform }})
         working-directory: src-csharp/RDPOffsetFinder
         run: |
-          msbuild RDPWrapOffsetFinder\RDPWrapOffsetFinder.vcxproj `
+          msbuild RDPWrapOffsetFinder.sln `
+            /t:RDPWrapOffsetFinder `
             /p:Configuration=Release `
-            /p:Platform="${{ matrix.platform }}" `
+            /p:Platform="${{ matrix.sln_platform }}" `
             /p:PlatformToolset=v143 `
             /v:minimal
 
@@ -70,7 +73,8 @@ jobs:
         run: |
           $arch  = if ("${{ matrix.platform }}" -eq "Win32") { "x86" } else { "x64" }
           $root  = "src-csharp/RDPOffsetFinder"
-          $exe   = "$root/RDPWrapOffsetFinder/${{ matrix.finder_plat }}/Release/RDPWrapOffsetFinder.exe"
+          # Win32 OutDir = Release\ (no platform prefix); x64 OutDir = x64\Release\
+          $exe   = "$root/${{ matrix.out_dir }}/RDPWrapOffsetFinder.exe"
           $dll   = "$root/zydis/msvc/bin/${{ matrix.zydis_bin }}/Zydis.dll"
 
           Write-Host "Exe: $(Get-Item $exe | Select-Object -Exp Length) bytes"