diff --git a/source/glest_game/facilities/components.cpp b/source/glest_game/facilities/components.cpp
index a73aeac12..3eefe20d6 100644
--- a/source/glest_game/facilities/components.cpp
+++ b/source/glest_game/facilities/components.cpp
@@ -56,7 +56,10 @@ bool GraphicComponent::mouseMove(int x, int y){
 }
 
 bool GraphicComponent::mouseClick(int x, int y){
-    return mouseMove(x, y);
+	if(getEnabled()&&getEditable())
+    	return mouseMove(x, y);
+    else
+    	return false;
 }
 
 void GraphicComponent::update(){
diff --git a/source/glest_game/facilities/game_util.cpp b/source/glest_game/facilities/game_util.cpp
index 9d11d010e..4e4af5a2f 100644
--- a/source/glest_game/facilities/game_util.cpp
+++ b/source/glest_game/facilities/game_util.cpp
@@ -26,7 +26,7 @@ using namespace Shared::Platform;
 namespace Glest{ namespace Game{
 
 const string mailString= "contact_game@glest.org";
-const string glestVersionString= "v3.3.5-alpha2";
+const string glestVersionString= "v3.3.5-dev";
 
 string getCrashDumpFileName(){
 	return "glest" + glestVersionString + ".dmp";
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 4dd1eae7c..3fcd261b1 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -605,7 +605,7 @@ void MenuStateCustomGame::update()
 					//printf("FYI we have at least 1 client connected, slot = %d'\n",i);
 
 					haveAtLeastOneNetworkClientConnected = true;
-					if(connectionSlot->getName()!="")
+					if(connectionSlot->getConnectHasHandshaked())
 						currentConnectionCount++;
 					//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s] B - ctNetwork\n",__FILE__,__FUNCTION__);
 
@@ -744,6 +744,7 @@ void MenuStateCustomGame::update()
 		//SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
 
 		if(currentConnectionCount>soundConnectionCount){
+			soundConnectionCount=currentConnectionCount;
 			SoundRenderer::getInstance().playFx(CoreData::getInstance().getAttentionSound());
 		}
 		soundConnectionCount=currentConnectionCount;
diff --git a/source/glest_game/menu/menu_state_masterserver.cpp b/source/glest_game/menu/menu_state_masterserver.cpp
index 9bb2e6c31..53b48c09a 100644
--- a/source/glest_game/menu/menu_state_masterserver.cpp
+++ b/source/glest_game/menu/menu_state_masterserver.cpp
@@ -86,6 +86,11 @@ ServerLine::ServerLine( MasterServerInfo *mServerInfo, int lineIndex)
 	i+=50;
 	selectButton.init(i, startOffset-lineOffset, 30);
 	selectButton.setText(">");
+	if(glestVersionString!=masterServerInfo->getGlestVersion())
+	{
+		selectButton.setEnabled(false);
+		selectButton.setEditable(false);
+	}
 }
 
 ServerLine::~ServerLine(){