diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index a4b20755..8010010f 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -513,9 +513,9 @@ ServerLobbyThread::HandleRead(SessionId sessionId, const boost::system::error_co
 			{
 				boost::shared_ptr<NetPacket> packet = buf.receivedPackets.front();
 				buf.receivedPackets.pop_front();
-				if (game)
-					game->HandlePacket(session, packet);
-				else
+//				if (game)
+//					game->HandlePacket(session, packet);
+//				else
 					HandlePacket(session, packet);
 			}
 			session.sessionData->GetAsioSocket()->async_read_some(
@@ -533,7 +533,7 @@ ServerLobbyThread::HandleRead(SessionId sessionId, const boost::system::error_co
 			boost::shared_ptr<ServerGameThread> game;
 			if (gameId)
 			{
-				GameMap::iterator pos = m_gameMap.find(joinGameData.gameId);
+				GameMap::iterator pos = m_gameMap.find(gameId);
 
 				if (pos != m_gameMap.end())
 					game = pos->second;
diff --git a/src/net/netcontext.h b/src/net/netcontext.h
index b55da783..9520a881 100644
--- a/src/net/netcontext.h
+++ b/src/net/netcontext.h
@@ -23,6 +23,9 @@
 
 #include <boost/asio.hpp>
 
+#ifndef _WIN32
+	#define SOCKET							int
+#endif
 
 class NetContext
 {
diff --git a/src/net/servergamethread.h b/src/net/servergamethread.h
index 294b2d29..2978bcb7 100644
--- a/src/net/servergamethread.h
+++ b/src/net/servergamethread.h
@@ -171,6 +171,7 @@ private:
 
 	boost::timers::portable::microsec_timer m_voteKickActionTimer;
 
+friend class ServerLobbyThread;
 friend class AbstractServerGameStateReceiving;
 friend class AbstractServerGameStateRunning;
 friend class AbstractServerGameStateTimer;