diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b7502ea37..c18a35b37 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,7 +59,11 @@ jobs:
           path: ambuild
 
       - name: Install AMBuild
+        shell: bash
         run: |
+          if [ "$RUNNER_OS" == "Windows" ]; then
+            pip install setuptools
+          fi
           cd ambuild && python setup.py install && cd ..
 
       - name: Install Clang 16
diff --git a/gamedata/cs2fixes.games.txt b/gamedata/cs2fixes.games.txt
index bf717430b..ad4e6ddb5 100644
--- a/gamedata/cs2fixes.games.txt
+++ b/gamedata/cs2fixes.games.txt
@@ -8,7 +8,7 @@
             // "CCSPlayer_MovementServices::TryPlayerMove() Trace ended stuck"
             "TryPlayerMove"
             {
-                "library"    "server"
+                "library"	"server"
                 "windows"	"\x48\x8B\xC4\x4C\x89\x48\x20\x4C\x89\x40\x18\x48\x89\x50\x10\x48\x89\x48\x08\x55\x53\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\xA8\xC8\xFD\xFF\xFF"
                 "linux"     "\x55\x66\x0F\xEF\xC0\x48\x89\xE5\x41\x57\x41\x56\x49\x89\xF6\x41\x55\x49\x89\xD5"
             }
@@ -17,16 +17,16 @@
             // sub_18061D5B0(a1, a2, "PlayerMove_PostMove");
             "CategorizePosition"
             {
-                "library"    "server"
-                "windows"	"\x40\x55\x56\x57\x41\x55\x48\x8D\xAC\x24\x18\xFE\xFF\xFF"
-                "linux"        "\x55\x66\x0F\xEF\xC0\x48\x89\xE5\x41\x57\x41\x56\x48\x8D\x85\x2A\x2A\x2A\x2A\x41\x55"
+                "library"	"server"
+				"windows"	"\x40\x55\x56\x57\x41\x55\x48\x8D\xAC\x24\xF8\xFD\xFF\xFF"
+				"linux"		"\x48\xB8\x00\x00\x00\x00\x00\x00\x00\x07\x55\x66\x0F\xEF\xC0\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x89\xD5"
             }
             // Function with 5 arguments next to sv_walkable_normal references
             "TracePlayerBBox"
             {
 				"library" 	"server"
-				"windows" 	"\x4C\x89\x44\x24\x18\x55\x53\x56\x57\x41\x55\x41\x56\x48\x8D\xAC\x24\xF8\xFE\xFF\xFF"
-				"linux" 	"\x55\x48\x89\xE5\x41\x57\x49\x89\xFF\x41\x56\x49\x89\xCE\x41\x55\x49\x89\xD5"
+				"windows" 	"\x4C\x89\x44\x24\x18\x55\x53\x56\x57\x41\x55\x41\x56\x48\x8D\xAC\x24\xE8\xFE\xFF\xFF"
+				"linux" 	"\x55\x48\x89\xE5\x41\x57\x49\x89\xFF\x41\x56\x49\x89\xD6\x41\x55\x49\x89\xCD"
 			}
 			// String: "Noise removal", there should be 3 customermachine checks
 			"HammerNoCustomerMachine"
@@ -109,7 +109,7 @@
 			{
 				"library"		"server"
 				"windows"		"\x44\x88\x4C\x24\x2A\x53\x57\x41\x54\x41\x56\x41\x57\x48\x83\xEC"
-				"linux"			"\x55\x48\x8D\x87\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x57\x41\x56\x41\x89\xCE\x41\x55\x45\x89\xCD"
+				"linux"			"\x55\x48\x8D\x87\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x57\x41\x89\xCF"
 			}
 			// String: "CNavMesh::GetNearestNavArea"
 			"CNavMesh_GetNearestNavArea"
@@ -191,7 +191,7 @@
 			{
 				"library"	"server"
 				"windows"	"\x40\x57\x41\x57\x48\x81\xEC\x2A\x2A\x2A\x2A\x48\x83\x79"
-				"linux"		"\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x49\x89\xF4\x53\x48\x89\xFB\x48\x83\xEC\x38\x48\x8B\x7F\x30"
+				"linux"		"\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x49\x89\xF5\x41\x54\x53\x48\x89\xFB\x48\x83\xEC\x2A\x48\x8B\x7F"
 			}
 			
 			// "env_shake %s with...", in either xref there will be a call to SetMoveType(a1, 0, 0) at the top
@@ -321,4 +321,4 @@
 			}
 		}
 	}
-}
+}
\ No newline at end of file
diff --git a/sdk b/sdk
index 84a823db0..4d71c9c5b 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit 84a823db042b49d2f6934b770dafbf3a366cef26
+Subproject commit 4d71c9c5b0b27bdee042f713c9db5770121a2151
diff --git a/src/cs2_sdk/entity/services.h b/src/cs2_sdk/entity/services.h
index 82ff2611b..c7c218560 100644
--- a/src/cs2_sdk/entity/services.h
+++ b/src/cs2_sdk/entity/services.h
@@ -90,7 +90,6 @@ class CPlayer_MovementServices_Humanoid : public CPlayer_MovementServices
 	SCHEMA_FIELD(uint32_t, m_nCrouchState)
 	SCHEMA_FIELD(bool, m_bInDuckJump)
 	SCHEMA_FIELD(float, m_flSurfaceFriction)
-	SCHEMA_FIELD(bool, m_bDucked)
 };
 
 class CCSPlayer_MovementServices : public CPlayer_MovementServices_Humanoid
@@ -103,6 +102,7 @@ class CCSPlayer_MovementServices : public CPlayer_MovementServices_Humanoid
 	SCHEMA_FIELD(float, m_flStamina)
 	SCHEMA_FIELD(float, m_flDuckSpeed)
 	SCHEMA_FIELD(bool, m_bDuckOverride)
+	SCHEMA_FIELD(bool, m_bDucked)
 };
 
 class CPlayer_WeaponServices : public CPlayerPawnComponent
@@ -380,4 +380,4 @@ class CMoveData : public CMoveDataBase
 static_assert(sizeof(CMoveData) == 312, "Class didn't match expected size");
 #else
 static_assert(sizeof(CMoveData) == 304, "Class didn't match expected size");
-#endif
\ No newline at end of file
+#endif