diff --git a/gamedata/cs2fixes.games.txt b/gamedata/cs2fixes.games.txt
index 2c871c0df..7aea80d24 100644
--- a/gamedata/cs2fixes.games.txt
+++ b/gamedata/cs2fixes.games.txt
@@ -25,8 +25,8 @@
             "TracePlayerBBox"
             {
 				"library" 	"server"
-				"windows" 	"\x48\x8B\xC4\x4C\x89\x40\x18\x55\x53\x57"
-				"linux" 	"\x55\x48\x89\xE5\x41\x57\x49\x89\xD7\x41\x56\x4D\x89\xC6\x41\x55\x49\x89\xCD\x41\x54\x53"
+				"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\x41\x56\x49\x89\xD6\x41\x55\x49\x89\xFD\x41\x54\x53\x48\x89\xF3\x48\x81\xEC\xD8\x01\x00\x00"
 			}
 			// String: "Noise removal", there should be 3 customermachine checks
 			"HammerNoCustomerMachine"
@@ -81,7 +81,7 @@
 			{
 				"library"		"server"
 				"windows"		"\x48\x83\xEC\x68\x45\x33\xC9"
-				"linux"			"\x55\x45\x31\xC0\x31\xC9\x48\x89\xE5\x53"
+				"linux"			"\x55\x45\x31\xC0\x31\xC9\x48\x89\xE5\x53\x48\x8D\x5D\x2A\x48\x83\xEC\x2A\x48\x89\xDF"
 			}
 			// "commentary_semaphore" is passed to this
 			"CGameEntitySystem_FindEntityByName"
@@ -108,7 +108,7 @@
 			"CBasePlayerController_SetPawn"
 			{
 				"library"		"server"
-				"windows"		"\x44\x88\x4C\x24\x2A\x53\x57"
+				"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"
 			}
 			// String: "CNavMesh::GetNearestNavArea"
@@ -116,7 +116,7 @@
 			{
 				"library"		"server"
 				"windows"		"\x48\x89\x5C\x24\x2A\x44\x89\x4C\x24\x2A\x48\x89\x54\x24\x2A\x48\x89\x4C\x24\x2A\x55\x56\x57\x41\x54\x41\x55\x41\x56\x41\x57\x48\x8D\xAC\x24"
-				"linux"			"\x55\x48\x8D\x05\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x57\x4D\x89\xC7"
+				"linux"			"\x55\x48\x8D\x05\x2A\x2A\x2A\x2A\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x49\x89\xD5\x41\x54\x4C\x8D\x25"
 			}
 			// Search "Changes's player's model", look for a function containing 'models/%s.vmdl'. Below V_snprintf is the one
 			// This matches 2 functions on linux, however they're literally identical
@@ -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\x2A\x48\x8B\x7F\x2A\x48\x85\xFF\x0F\x84\x2A\x2A\x2A\x2A\x8B\x8F"
+				"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"
 			}
 			
 			// "env_shake %s with...", in either xref there will be a call to SetMoveType(a1, 0, 0) at the top
@@ -263,8 +263,8 @@
 			// 2872 (359 * 8) is the offset
 			"CBasePlayerPawn_CommitSuicide"
 			{
-				"windows"		"404"
-				"linux"			"404"
+				"windows"		"408"
+				"linux"			"408"
 			}
 			// In the function with "[%03d] Found: %s, firing\n", you'll find a call into a pointer offset just a bit higher, that's the offset * 8
 			"CGameRules_FindPickerEntity"
diff --git a/sdk b/sdk
index 93ccb6b7b..0f84fcf12 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit 93ccb6b7b2ba8e4fcaca224ce21badbe35491280
+Subproject commit 0f84fcf129f20dcaed07f9628c3555ee9b0b0f6c