diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
index b7f27cec9..5e317362f 100644
--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -35,7 +35,7 @@ string getCrashDumpFileName(){
 string getNetworkVersionString() {
 	string version = glestVersionString + " built: " + string(__DATE__) + " " + string(__TIME__);
 #if defined(WIN32) && defined(_MSC_VER)
-	version += " MSC_VER " + _MSC_VER;
+	version += " Compiled using MSC_VER: " + intToStr(_MSC_VER);
 #elif defined(__GNUC__)
 
 	#if defined(__GNUC__)
@@ -49,7 +49,7 @@ string getNetworkVersionString() {
 	# endif
 	#endif
 
-	version += " GNUC_VERSION " + intToStr(__GNUC_VERSION__);
+	version += " Compiled using GNUC_VERSION: " + intToStr(__GNUC_VERSION__);
 #endif
 	return version;
 }
diff --git a/source/glest_game/network/client_interface.cpp b/source/glest_game/network/client_interface.cpp
index 38848a01e..bea030088 100755
--- a/source/glest_game/network/client_interface.cpp
+++ b/source/glest_game/network/client_interface.cpp
@@ -667,7 +667,7 @@ void ClientInterface::waitForMessage()
 			return;
 		}
 
-		if(chrono.getMillis()>messageWaitTimeout)
+		if(chrono.getMillis() > messageWaitTimeout)
 		{
 			//throw runtime_error("Timeout waiting for message");
             sendTextMessage("Timeout waiting for message",-1);
@@ -677,7 +677,7 @@ void ClientInterface::waitForMessage()
             return;
 		}
 
-		sleep(waitSleepTime);
+		//sleep(waitSleepTime);
 		waitLoopCount++;
 	}
 
diff --git a/source/glest_game/network/network_message.cpp b/source/glest_game/network/network_message.cpp
index cc9d08eee..65d9ce2b4 100644
--- a/source/glest_game/network/network_message.cpp
+++ b/source/glest_game/network/network_message.cpp
@@ -230,7 +230,7 @@ NetworkMessageCommandList::NetworkMessageCommandList(int32 frameCount){
 }
 
 bool NetworkMessageCommandList::addCommand(const NetworkCommand* networkCommand){
-	if(data.commandCount<maxCommandCount){
+	if(data.commandCount < maxCommandCount){
 		data.commands[static_cast<int>(data.commandCount)]= *networkCommand;
 		data.commandCount++;
 		return true;
diff --git a/source/glest_game/network/network_message.h b/source/glest_game/network/network_message.h
index 46773e22f..171d466d5 100644
--- a/source/glest_game/network/network_message.h
+++ b/source/glest_game/network/network_message.h
@@ -178,7 +178,8 @@ public:
 #pragma pack(push, 1)
 class NetworkMessageCommandList: public NetworkMessage{
 private:
-	static const int maxCommandCount= 16*4;
+	//static const int maxCommandCount= 16*4;
+	static const int maxCommandCount = (16 * 4) * 2;
 
 private:
 	struct Data{
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index 80701dca3..ef1e1d289 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -322,7 +322,8 @@ void ServerInterface::waitUntilReady(Checksum* checksum){
 						return;
 					}
 
-					waitingForHosts.push_back(connectionSlot->getHostName());
+					//waitingForHosts.push_back(connectionSlot->getHostName());
+					waitingForHosts.push_back(connectionSlot->getName());
 
 					allReady= false;
 				}