diff --git a/source/game/facilities/game_util.cpp b/source/game/facilities/game_util.cpp
index 7b1d0081c..e044a4351 100644
--- a/source/game/facilities/game_util.cpp
+++ b/source/game/facilities/game_util.cpp
@@ -39,7 +39,7 @@ namespace Game {
 	const char *mailString = "https://github.com/Glest";
 
 	string getCrashDumpFileName() {
-		return GameVersionString + ".dmp";
+		return "glest.dmp";
 	}
 	string getPlatformTypeNameString() {
 		static string platform;
diff --git a/source/game/game/script_manager.cpp b/source/game/game/script_manager.cpp
index 76cee124d..d096a9f72 100644
--- a/source/game/game/script_manager.cpp
+++ b/source/game/game/script_manager.cpp
@@ -2454,13 +2454,12 @@ namespace Game {
 	}
 
 	bool
-		ScriptManager::areCellsFree(Vec2i pos, int size, int field) {
+		ScriptManager::areCellsFree(int size, int field, Vec2i pos) {
 		if (SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled)
 			SystemFlags::OutputDebug(SystemFlags::debugLUA,
 				"In [%s::%s Line: %d]\n",
 				extractFileFromDirectoryPath(__FILE__).
 				c_str(), __FUNCTION__, __LINE__);
-
 		return world->areCellsFree(pos, size, static_cast<Field>(field));
 	}
 
@@ -4485,7 +4484,7 @@ namespace Game {
 			luaArguments(luaHandle);
 
 		try {
-			bool result = thisScriptManager->areCellsFree(luaArguments.getVec2i(-3), luaArguments.getInt(-2), luaArguments.getInt(-1));
+			bool result = thisScriptManager->areCellsFree(luaArguments.getInt(-3), luaArguments.getInt(-2), luaArguments.getVec2i(-1));
 			luaArguments.returnInt(result ? 1 : 0);
 		} catch (const game_runtime_error & ex) {
 			error(luaHandle, &ex, __FILE__, __FUNCTION__, __LINE__);
diff --git a/source/game/game/script_manager.h b/source/game/game/script_manager.h
index 52af7d32f..c95070fa1 100644
--- a/source/game/game/script_manager.h
+++ b/source/game/game/script_manager.h
@@ -630,7 +630,7 @@ namespace Game {
 		Vec2i
 			getUnitPosition(int unitId);
 		bool
-			areCellsFree(Vec2i pos, int size, int field);
+			areCellsFree(int size, int field, Vec2i pos);
 		int
 			getUnitFaction(int unitId);
 		const string
diff --git a/source/game/global/core_data.cpp b/source/game/global/core_data.cpp
index d5e96880c..d483fd6d3 100644
--- a/source/game/global/core_data.cpp
+++ b/source/game/global/core_data.cpp
@@ -1730,7 +1730,7 @@ namespace Game {
 				properties.
 				getString(string
 				("FactionTypeNameForIndex")
-					+ intToStr(i), "?"));
+					+ intToStr(i), "Unknown"));
 
 			if (SystemFlags::getSystemSettingType(SystemFlags::debugSystem).
 				enabled)
diff --git a/source/game/graphics/renderer.cpp b/source/game/graphics/renderer.cpp
index 576e59faa..7d7a4aaca 100644
--- a/source/game/graphics/renderer.cpp
+++ b/source/game/graphics/renderer.cpp
@@ -7364,11 +7364,11 @@ namespace Game {
 		if (GlobalStaticFlags::getIsNonGraphicalModeEnabled() == false) {
 			infoStr += lang.getString("OpenGlInfo") + ":\n";
 			infoStr += "   " + lang.getString("OpenGlVersion") + ": ";
-			infoStr += string((getGlVersion() != NULL ? getGlVersion() : "?")) + "\n";
+			infoStr += string((getGlVersion() != NULL ? getGlVersion() : "unknown")) + "\n";
 			infoStr += "   " + lang.getString("OpenGlRenderer") + ": ";
-			infoStr += string((getGlVersion() != NULL ? getGlVersion() : "?")) + "\n";
+			infoStr += string((getGlVersion() != NULL ? getGlVersion() : "unknown")) + "\n";
 			infoStr += "   " + lang.getString("OpenGlVendor") + ": ";
-			infoStr += string((getGlVendor() != NULL ? getGlVendor() : "?")) + "\n";
+			infoStr += string((getGlVendor() != NULL ? getGlVendor() : "unknown")) + "\n";
 			infoStr += "   " + lang.getString("OpenGlMaxLights") + ": ";
 			infoStr += intToStr(getGlMaxLights()) + "\n";
 			infoStr += "   " + lang.getString("OpenGlMaxTextureSize") + ": ";
diff --git a/source/game/menu/menu_state_connected_game.cpp b/source/game/menu/menu_state_connected_game.cpp
index 0ef79420b..5850d82d6 100644
--- a/source/game/menu/menu_state_connected_game.cpp
+++ b/source/game/menu/menu_state_connected_game.cpp
@@ -380,7 +380,7 @@ namespace Game {
 
 		labelMapInfo.registerGraphicComponent(containerName, "labelMapInfo");
 		labelMapInfo.init(xoffset + 100, mapPos - labelOffset - 10, 200, 40);
-		labelMapInfo.setText("?");
+		labelMapInfo.setText("");
 
 		labelMap.registerGraphicComponent(containerName, "labelMap");
 		labelMap.init(xoffset + 100, mapHeadPos);
diff --git a/source/game/menu/menu_state_root.cpp b/source/game/menu/menu_state_root.cpp
index d4de24d81..d4bda0027 100644
--- a/source/game/menu/menu_state_root.cpp
+++ b/source/game/menu/menu_state_root.cpp
@@ -865,17 +865,15 @@ namespace Game {
 						char szMsg[8096] = "";
 						snprintf(szMsg, 8096,
 							"A new update was detected: %s\nUpdate Date: %s\nPlease visit glest.github.io for details!",
-							props.getString("LatestGameVersion", "?").c_str(),
-							props.getString("LatestGameVersionReleaseDate",
-								"?").c_str());
+							props.getString("LatestGameVersion", "unknown").c_str(),
+							props.getString("LatestGameVersionReleaseDate", "unknown").c_str());
 						showFTPMessageBox(szMsg, "Update", false, true);
 					} else {
 						char szMsg[8096] = "";
 						snprintf(szMsg, 8096,
 							"A new update was detected: %s\nUpdate Date: %s\nDownload update now?",
-							props.getString("LatestGameVersion", "?").c_str(),
-							props.getString("LatestGameVersionReleaseDate",
-								"?").c_str());
+							props.getString("LatestGameVersion", "unknown").c_str(),
+							props.getString("LatestGameVersionReleaseDate", "unknown").c_str());
 						showFTPMessageBox(szMsg, "Update", false, false);
 					}
 				}
diff --git a/source/game/network/masterserver_info.h b/source/game/network/masterserver_info.h
index a8e4974f1..189cefdc4 100644
--- a/source/game/network/masterserver_info.h
+++ b/source/game/network/masterserver_info.h
@@ -144,7 +144,7 @@ namespace Game {
 			externalconnectport = value;
 		}
 		void setCountry(string value) {
-			country = value;
+			country = value == "??" ? "" : value;
 		}
 		void setStatus(int value) {
 			status = value;