diff --git a/src/gui/qt/startwindow/startwindowimpl.h b/src/gui/qt/startwindow/startwindowimpl.h
index e26952d4..e5fc43a5 100644
--- a/src/gui/qt/startwindow/startwindowimpl.h
+++ b/src/gui/qt/startwindow/startwindowimpl.h
@@ -21,6 +21,7 @@
 #define STARTWINDOWIMPL_H
 
 #include <boost/shared_ptr.hpp>
+#include <assert.h>
 #include "ui_startwindow.h"
 #include "game_defs.h"
 
diff --git a/src/net/common/sessionmanager.cpp b/src/net/common/sessionmanager.cpp
index 5ae22a0d..d3f15809 100644
--- a/src/net/common/sessionmanager.cpp
+++ b/src/net/common/sessionmanager.cpp
@@ -121,7 +121,7 @@ SessionManager::GetSessionByPlayerName(const string playerName) const
 }
 
 SessionWrapper
-SessionManager::GetSessionByUniquePlayerId(unsigned uniqueId, bool preInitSessions) const
+SessionManager::GetSessionByUniquePlayerId(unsigned uniqueId, bool initSessions) const
 {
 	SessionWrapper tmpSession;
 	boost::recursive_mutex::scoped_lock lock(m_sessionMapMutex);
@@ -132,7 +132,7 @@ SessionManager::GetSessionByUniquePlayerId(unsigned uniqueId, bool preInitSessio
 	while (session_i != session_end)
 	{
 		// Check all players which are fully connected.
-		if (preInitSessions || session_i->second.sessionData->GetState() != SessionData::Init)
+		if (initSessions || session_i->second.sessionData->GetState() != SessionData::Init)
 		{
 			boost::shared_ptr<PlayerData> tmpPlayer(session_i->second.playerData);
 			if (!tmpPlayer.get())
diff --git a/src/net/sessionmanager.h b/src/net/sessionmanager.h
index 509356f7..d88bcc73 100644
--- a/src/net/sessionmanager.h
+++ b/src/net/sessionmanager.h
@@ -55,7 +55,7 @@ public:
 
 	SessionWrapper GetSessionById(SessionId id) const;
 	SessionWrapper GetSessionByPlayerName(const std::string playerName) const;
-	SessionWrapper GetSessionByUniquePlayerId(unsigned uniqueId, bool preInitSessions = false) const;
+	SessionWrapper GetSessionByUniquePlayerId(unsigned uniqueId, bool initSessions = false) const;
 
 	PlayerDataList GetPlayerDataList() const;
 	PlayerIdList GetPlayerIdList(SessionData::State state) const;