diff --git a/gamedata/cs2fixes.games.txt b/gamedata/cs2fixes.games.txt
index a602d9708..4a9a53c2f 100644
--- a/gamedata/cs2fixes.games.txt
+++ b/gamedata/cs2fixes.games.txt
@@ -24,10 +24,10 @@
             // Function with 5 arguments next to sv_walkable_normal references
             "TracePlayerBBox"
             {
-                "library"     "server"
-                "windows" 	"\x48\x8B\xC4\x4C\x89\x40\x18\x55\x53\x57\x41\x55\x41\x56"
-                "linux"     "\x55\x48\x89\xE5\x41\x57\x49\x89\xFF\x41\x56\x49\x89\xF6\x41\x55\x49\x89\xCD"
-            }
+				"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"
+			}
 			// String: "Noise removal", there should be 3 customermachine checks
 			"HammerNoCustomerMachine"
 			{
diff --git a/sdk b/sdk
index d03fadc6d..510a1e4e8 160000
--- a/sdk
+++ b/sdk
@@ -1 +1 @@
-Subproject commit d03fadc6df7582da1eb55f3d7f5a5405b2d82df9
+Subproject commit 510a1e4e837461a8a30591667def9321179c0dad
diff --git a/src/cs2fixes.cpp b/src/cs2fixes.cpp
index 9ab6bfb95..579ec7452 100644
--- a/src/cs2fixes.cpp
+++ b/src/cs2fixes.cpp
@@ -253,7 +253,7 @@ const char *CS2Fixes::GetLicense()
 const char *CS2Fixes::GetVersion()
 {
 #ifndef CS2FIXES_VERSION
-#define CS2FIXES_VERSION "1.7-dev"
+#define CS2FIXES_VERSION "1.8-dev"
 #endif
 
 	return CS2FIXES_VERSION; // defined by the build script
diff --git a/src/detours.cpp b/src/detours.cpp
index 206bf91fa..da3dbfd3b 100644
--- a/src/detours.cpp
+++ b/src/detours.cpp
@@ -189,10 +189,6 @@ void TryPlayerMovePre(CCSPlayer_MovementServices *ms, Vector *pFirstDest, trace_
 		// Assume we can move all the way from the current origin to the end point.
 		VectorMA(start, timeLeft, velocity, end);
 		// See if we can make it from origin to end point.
-		if (numPlanes == 1)
-		{
-			VectorMA(end, 0.03125f, planes[0], end);
-		}
 		// If their velocity Z is 0, then we can avoid an extra trace here during WalkMove.
 		if (pFirstDest && end == *pFirstDest)
 		{
diff --git a/src/utils/entity.cpp b/src/utils/entity.cpp
index 0368ef54d..8e0b8b365 100644
--- a/src/utils/entity.cpp
+++ b/src/utils/entity.cpp
@@ -37,6 +37,9 @@ class Z_CBaseEntity;
 
 Z_CBaseEntity *UTIL_FindPickerEntity(CBasePlayerController *pPlayer)
 {
+	if (!g_pGameRules)
+		return nullptr;
+	
 	static int offset = g_GameConfig->GetOffset("CGameRules_FindPickerEntity");
 
 	if (offset < 0)