diff --git a/src/core/common/avatarmanager.cpp b/src/core/common/avatarmanager.cpp
index f98d489b..92ffd268 100644
--- a/src/core/common/avatarmanager.cpp
+++ b/src/core/common/avatarmanager.cpp
@@ -525,7 +525,7 @@ AvatarManager::RemoveOldAvatarCacheEntries()
 			while (!timeMap.empty() && !m_cachedAvatars.empty())
 			{
 				TimeAvatarMap::iterator i = timeMap.begin();
-				if (curTime - i->first < MAX_AVATAR_CACHE_AGE)
+				if (curTime - i->first < (int)MAX_AVATAR_CACHE_AGE)
 					break;
 				AvatarMap::iterator pos = m_cachedAvatars.find(i->second);
 				if (pos != m_cachedAvatars.end())
diff --git a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
index efc06c1d..9f1fe31e 100644
--- a/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
+++ b/src/gui/qt/gamelobbydialog/gamelobbydialogimpl.cpp
@@ -262,7 +262,7 @@ void gameLobbyDialogImpl::updateGameItem(QTreeWidgetItem *item, unsigned gameId)
 	item->setData(0, Qt::DisplayRole, QString::fromUtf8(info.name.c_str()));
 
 	QString playerStr;
-	playerStr.sprintf("%u/%u", info.players.size(), info.data.maxNumberOfPlayers);
+	playerStr.sprintf("%u/%u", (unsigned)info.players.size(), (unsigned)info.data.maxNumberOfPlayers);
 	item->setData(1, Qt::DisplayRole, playerStr);
 
 	if (info.mode == GAME_MODE_STARTED)
diff --git a/src/net/common/ircthread.cpp b/src/net/common/ircthread.cpp
index a478a857..eef09d75 100644
--- a/src/net/common/ircthread.cpp
+++ b/src/net/common/ircthread.cpp
@@ -252,7 +252,8 @@ irc_event_numeric(irc_session_t * session, unsigned irc_event, const char * /*or
 }
 
 IrcThread::IrcThread(const IrcThread &other)
-: m_terminationTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::microsec_timer::manual_start),
+: Thread(),
+  m_terminationTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::microsec_timer::manual_start),
   m_lastConnectTimer(boost::posix_time::time_duration(0, 0, 0), boost::timers::portable::microsec_timer::manual_start)
 {
 	m_callback = other.m_callback;
diff --git a/src/net/common/servergamestate.cpp b/src/net/common/servergamestate.cpp
index 731192a4..8c89dc0f 100644
--- a/src/net/common/servergamestate.cpp
+++ b/src/net/common/servergamestate.cpp
@@ -690,7 +690,7 @@ ServerGameStateHand::HandleNewSession(SessionWrapper session)
 }
 
 int
-ServerGameStateHand::InternalProcessPacket(SessionWrapper session, boost::shared_ptr<NetPacket> packet)
+ServerGameStateHand::InternalProcessPacket(SessionWrapper /*session*/, boost::shared_ptr<NetPacket> /*packet*/)
 {
 	// TODO: maybe reject packet.
 	return MSG_SOCK_INTERNAL_PENDING;
diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp
index b220600e..441d4bdc 100644
--- a/src/net/common/serverlobbythread.cpp
+++ b/src/net/common/serverlobbythread.cpp
@@ -198,6 +198,8 @@ ServerLobbyThread::MoveSessionToGame(ServerGameThread &game, SessionWrapper sess
 	m_gameSessionManager.AddSession(session);
 	// Add session to the game.
 	game.AddSession(session);
+	// Set the game id of the session.
+	session.sessionData->SetGameId(game.GetId());
 }
 
 void
@@ -205,6 +207,7 @@ ServerLobbyThread::RemoveSessionFromGame(SessionWrapper session)
 {
 	// Just remove the session. Only for fatal errors.
 	CloseSession(session);
+	session.sessionData->SetGameId(0);
 }
 
 void
@@ -1271,6 +1274,7 @@ ServerLobbyThread::HandleReAddedSession(SessionWrapper session)
 	{
 		// Set state (back) to established.
 		session.sessionData->SetState(SessionData::Established);
+		session.sessionData->SetGameId(0);
 		// Add session to lobby list.
 		m_sessionManager.AddSession(session);
 	}