diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 916bf5370..bee2343c2 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -319,10 +319,12 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
 		listBoxTeams[i].setEditable(false);
 
 		labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i));
-		labelNetStatus[i].init(xoffset+670, setupPos-30-i*rowHeight, 60);
+		labelNetStatus[i].init(xoffset+655, setupPos-30-i*rowHeight, 60);
+		labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall());
+		labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
 
 		grabSlotButton[i].registerGraphicComponent(containerName,"grabSlotButton" + intToStr(i));
-		grabSlotButton[i].init(xoffset+670, setupPos-30-i*rowHeight, 30);
+		grabSlotButton[i].init(xoffset+660, setupPos-30-i*rowHeight, 30);
 		grabSlotButton[i].setText(">");
     }
 
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index 195e3c79c..76e6209b7 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -463,7 +463,9 @@ MenuStateCustomGame::MenuStateCustomGame(Program *program, MainMenu *mainMenu,
 		listBoxTeams[i].init(xoffset+590, setupPos-30-i*rowHeight, 60);
 
 		labelNetStatus[i].registerGraphicComponent(containerName,"labelNetStatus" + intToStr(i));
-		labelNetStatus[i].init(xoffset+670, setupPos-30-i*rowHeight, 60);
+		labelNetStatus[i].init(xoffset+655, setupPos-30-i*rowHeight, 60);
+		labelNetStatus[i].setFont(CoreData::getInstance().getDisplayFontSmall());
+		labelNetStatus[i].setFont3D(CoreData::getInstance().getDisplayFontSmall3D());
     }
 
 	labelControl.registerGraphicComponent(containerName,"labelControl");
diff --git a/source/glest_game/menu/menu_state_mods.cpp b/source/glest_game/menu/menu_state_mods.cpp
index c4e851ce1..0140624e1 100644
--- a/source/glest_game/menu/menu_state_mods.cpp
+++ b/source/glest_game/menu/menu_state_mods.cpp
@@ -487,6 +487,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
 			keyTilesetButtons.push_back(button);
 		}
 	}
+
+    if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
+    	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
+        return;
+    }
+
 	for(unsigned int i=0; i < tilesetFilesUserData.size(); i++) {
 		string tilesetName = tilesetFilesUserData[i];
 		bool alreadyHasTileset = (tilesetCacheList.find(tilesetName) != tilesetCacheList.end());
@@ -512,6 +518,11 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
 	techListRemote.clear();
 	Tokenize(techsMetaData,techListRemote,"\n");
 
+    if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
+    	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
+        return;
+    }
+
 	getTechsLocalList();
 	for(unsigned int i=0; i < techListRemote.size(); i++) {
 		string result=refreshTechModInfo(techListRemote[i]);
@@ -532,6 +543,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
 			labelsTech.push_back(label);
 		}
 	}
+
+    if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
+    	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
+        return;
+    }
+
 	for(unsigned int i=0; i < techTreeFilesUserData.size(); i++) {
 		string techName = techTreeFilesUserData[i];
 		bool alreadyHasTech = (techCacheList.find(techName) != techCacheList.end());
@@ -589,6 +606,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
 			labelsMap.push_back(label);
 		}
 	}
+
+    if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
+    	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
+        return;
+    }
+
 	for(unsigned int i=0; i < mapFilesUserData.size(); i++) {
 		string mapName = mapFilesUserData[i];
 		bool alreadyHasMap = (mapCacheList.find(mapName) != mapCacheList.end());
@@ -640,6 +663,12 @@ void MenuStateMods::simpleTask(BaseThread *callingThread) {
 			keyScenarioButtons.push_back(button);
 		}
 	}
+
+    if(callingThread->getQuitStatus() == true || safeMutexThreadOwner.isValidMutex() == false) {
+    	if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
+        return;
+    }
+
 	for(unsigned int i=0; i < scenarioFilesUserData.size(); i++) {
 		string scenarioName = scenarioFilesUserData[i];
 		bool alreadyHasScenario = (scenarioCacheList.find(scenarioName) != scenarioCacheList.end());