diff --git a/src/client/component/arxan/arxan.cpp b/src/client/component/arxan/arxan.cpp
index 89f6dbfd..373a066b 100644
--- a/src/client/component/arxan/arxan.cpp
+++ b/src/client/component/arxan/arxan.cpp
@@ -317,6 +317,7 @@ namespace arxan
 		void search_and_patch_integrity_checks()
 		{
 #ifdef PRECOMPUTED_INTEGRITY_CHECKS
+			assert(game::base_address == 0x140000000);
 			search_and_patch_integrity_checks_precomputed();
 #else
 			// There seem to be 670 results.
diff --git a/src/client/component/auth.cpp b/src/client/component/auth.cpp
index 471e2262..ba7ab28e 100644
--- a/src/client/component/auth.cpp
+++ b/src/client/component/auth.cpp
@@ -90,7 +90,7 @@ namespace auth
 			return 0x110000100000000 | (::utils::cryptography::random::get_integer() & ~0x80000000);
 		}
 
-		return 0x110000100000000 | get_key().get_hash();
+		return get_key().get_hash();
 	}
 
 	class component final : public component_interface
diff --git a/src/client/component/thread_names.cpp b/src/client/component/thread_names.cpp
index 9b48a196..d802ea1c 100644
--- a/src/client/component/thread_names.cpp
+++ b/src/client/component/thread_names.cpp
@@ -28,7 +28,7 @@ namespace thread_names
 				{game::THREAD_CONTEXT_SERVER, "Server"},
 				{game::THREAD_CONTEXT_CINEMATIC, "Cinematic"},
 				{game::THREAD_CONTEXT_WINDOW, "Window"},
-				{game::THREAD_CONTEXT_WINDOW, "Input"},
+				{game::THREAD_CONTEXT_INPUT, "Input"},
 				{game::THREAD_CONTEXT_DATABASE, "Database"},
 				{game::THREAD_CONTEXT_SOUND_STREAM, "Sound Stream"},
 				{game::THREAD_CONTEXT_SOUND, "Snd stream packet callback"},
diff --git a/src/client/game/game.cpp b/src/client/game/game.cpp
index 69d16a8e..83c1819f 100644
--- a/src/client/game/game.cpp
+++ b/src/client/game/game.cpp
@@ -179,9 +179,4 @@ namespace game
 			Cbuf_AddCall(0, SV_CmdsMP_CheckLoadGame);
 		}
 	}
-}
-
-uintptr_t operator"" _b(const uintptr_t ptr)
-{
-	return game::base_address + ptr;
 }
\ No newline at end of file
diff --git a/src/client/game/game.hpp b/src/client/game/game.hpp
index 65530715..ab503268 100644
--- a/src/client/game/game.hpp
+++ b/src/client/game/game.hpp
@@ -2,8 +2,6 @@
 
 #include "structs.hpp"
 
-#define SERVER_CD_KEY "IW7MOD-CD-Key"
-
 namespace game
 {
 	extern uint64_t base_address;
@@ -60,6 +58,9 @@ namespace game
 	void SV_CmdsMP_RequestMapRestart(bool loadScripts, bool migrate);
 }
 
-uintptr_t operator"" _b(const uintptr_t ptr);
+inline uintptr_t operator"" _b(const uintptr_t ptr)
+{
+	return game::base_address + ptr;
+}
 
 #include "symbols.hpp"