diff --git a/bam.lua b/bam.lua
index 56623e3dd1..c3e238b3c7 100644
--- a/bam.lua
+++ b/bam.lua
@@ -271,7 +271,7 @@ function build(settings)
 
 	-- build server
 	server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-		game_shared, game_server, zlib, server_link_other, teeuniverses, json, md5)
+		game_shared, game_server, zlib, md5, server_link_other, json, teeuniverses)
 
 	serverlaunch = {}
 	if platform == "macosx" then
diff --git a/src/game/server/gamecontext.h b/src/game/server/gamecontext.h
index a4a7aea8ad..5a57865aa2 100644
--- a/src/game/server/gamecontext.h
+++ b/src/game/server/gamecontext.h
@@ -87,7 +87,8 @@ class CGameContext : public IGameServer
 
 	int m_ConsoleOutputHandle_ChatPrint;
 	int m_ConsoleOutput_Target;
-	
+
+public:
 	int m_ZoneHandle_TeeWorlds;
 
 public: