diff --git a/src/client/component/imagefiles.cpp b/src/client/component/imagefiles.cpp
index a7dd5baf..2d10cb2b 100644
--- a/src/client/component/imagefiles.cpp
+++ b/src/client/component/imagefiles.cpp
@@ -66,7 +66,6 @@ namespace imagefiles
 
 		void db_create_gfx_image_stream_stub(utils::hook::assembler& a)
 		{
-			const auto check_image_file_handle = a.newLabel();
 			const auto handle_is_open = a.newLabel();
 
 			a.movzx(eax, cx);
diff --git a/src/client/component/thread_names.cpp b/src/client/component/thread_names.cpp
index 84b5fa70..19e469ac 100644
--- a/src/client/component/thread_names.cpp
+++ b/src/client/component/thread_names.cpp
@@ -27,10 +27,13 @@ namespace thread_names
 				{game::THREAD_CONTEXT_WORKER7, "Worker7"},
 				{game::THREAD_CONTEXT_SERVER, "Server"},
 				{game::THREAD_CONTEXT_CINEMATIC, "Cinematic"},
+				{game::THREAD_CONTEXT_WINDOW, "Window"},
+				{game::THREAD_CONTEXT_INPUT, "Input"},
 				{game::THREAD_CONTEXT_DATABASE, "Database"},
-				{game::THREAD_CONTEXT_STREAM, "Stream"},
-				{game::THREAD_CONTEXT_SNDSTREAMPACKETCALLBACK, "Snd stream packet callback"},
-				{game::THREAD_CONTEXT_STATS_WRITE, "Stats write"},
+				{game::THREAD_CONTEXT_STREAM, "Sound"},
+				{game::THREAD_CONTEXT_UNK_16, "Thread 16"}, // not used?
+				{game::THREAD_CONTEXT_UNK_17, "Thread 17"}, // sound stream related
+				{game::THREAD_CONTEXT_UNK_18, "Thread 18"}, // ^
 			};
 
 			for (const auto& thread_name : thread_names)
diff --git a/src/client/game/structs.hpp b/src/client/game/structs.hpp
index fe18b6b2..e0c399c9 100644
--- a/src/client/game/structs.hpp
+++ b/src/client/game/structs.hpp
@@ -589,11 +589,14 @@ namespace game
 		THREAD_CONTEXT_TRACE_COUNT = 0xB,
 		THREAD_CONTEXT_TRACE_LAST = 0xA,
 		THREAD_CONTEXT_CINEMATIC = 0xB,
-		THREAD_CONTEXT_DATABASE = 0xC,
-		THREAD_CONTEXT_STREAM = 0xD,
-		THREAD_CONTEXT_SNDSTREAMPACKETCALLBACK = 0xE,
-		THREAD_CONTEXT_STATS_WRITE = 0xF,
-		THREAD_CONTEXT_COUNT = 0x10,
+		THREAD_CONTEXT_WINDOW = 0xC,
+		THREAD_CONTEXT_INPUT = 0xD,
+		THREAD_CONTEXT_DATABASE = 0xE,
+		THREAD_CONTEXT_STREAM = 0xF,
+		THREAD_CONTEXT_UNK_16 = 0x10,
+		THREAD_CONTEXT_UNK_17 = 0x11,
+		THREAD_CONTEXT_UNK_18 = 0x12,
+		THREAD_COUNT,
 	};
 
 	struct KeyState