diff --git a/source/glest_game/facilities/components.cpp b/source/glest_game/facilities/components.cpp
index 713ef25a..955f426d 100644
--- a/source/glest_game/facilities/components.cpp
+++ b/source/glest_game/facilities/components.cpp
@@ -341,6 +341,7 @@ const int GraphicButton::defW= 90;
 
 GraphicButton::GraphicButton(std::string containerName, std::string objName) : GraphicComponent(containerName,objName) {
 	lighted = false;
+	alwaysLighted = false;
 	useCustomTexture = false;
 	customTexture = NULL;
 }
diff --git a/source/glest_game/facilities/components.h b/source/glest_game/facilities/components.h
index 7953d645..ef3e5898 100644
--- a/source/glest_game/facilities/components.h
+++ b/source/glest_game/facilities/components.h
@@ -212,6 +212,7 @@ public:
 	
 private:
 	bool lighted;
+	bool alwaysLighted;
 
 	bool useCustomTexture;
 	Texture *customTexture;
@@ -226,9 +227,10 @@ public:
 	void setUseCustomTexture(bool value) { useCustomTexture=value; }
 	void setCustomTexture(Texture *value) { customTexture=value; }
 
-	bool getLighted() const			{return lighted;}
-	
+	bool getLighted() const			{return lighted||alwaysLighted;}
 	void setLighted(bool lighted)	{this->lighted= lighted;}
+	bool getAlwaysLighted() const			{return alwaysLighted;}
+	void setAlwaysLighted(bool value)	{this->alwaysLighted= value;}
 	virtual bool mouseMove(int x, int y);  
 };
 
diff --git a/source/glest_game/menu/server_line.cpp b/source/glest_game/menu/server_line.cpp
index caeb81af..7b34c817 100644
--- a/source/glest_game/menu/server_line.cpp
+++ b/source/glest_game/menu/server_line.cpp
@@ -154,6 +154,7 @@ ServerLine::ServerLine(MasterServerInfo *mServerInfo, int lineIndex, int baseY,
 	i+= 130;
 	selectButton.init(i, baseY - lineOffset, 30);
 	selectButton.setText(">");
+	selectButton.setAlwaysLighted(true);
 
 	//printf("glestVersionString [%s] masterServerInfo->getGlestVersion() [%s]\n",glestVersionString.c_str(),masterServerInfo->getGlestVersion().c_str());
 	compatible= checkVersionComptability(glestVersionString, masterServerInfo.getGlestVersion());
diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp
index 56c28904..06c1a70e 100644
--- a/source/shared_lib/sources/util/util.cpp
+++ b/source/shared_lib/sources/util/util.cpp
@@ -819,9 +819,20 @@ int getMajor(string version){
 
 int getMinor(string version){
 	vector<string> parts=split(version.substr(1),".");
-
-	if(parts.size()>2 && parts[1] != "" && IsNumeric(parts[1].c_str(),false))
-		return strToInt(parts[1]);
+	if(parts.size()>2 && parts[1] != ""){
+		string resultStr="";
+		for (int i = 0; i < (int)parts[1].length(); ++i) {
+			// just add leading numbers
+			if(IsNumeric((resultStr+parts[1][i]).c_str(),false) )
+				resultStr += parts[1][i];
+			else
+				break;
+		}
+		if(resultStr=="")
+			return 0;
+		else
+			return strToInt(resultStr);
+	}
 	else
 		return 0;
 }