diff --git a/mk/linux/glest.ini b/mk/linux/glest.ini
index 13dfc2504..3a70457c9 100644
--- a/mk/linux/glest.ini
+++ b/mk/linux/glest.ini
@@ -16,7 +16,7 @@ AutoMaxFullScreen=false
 AutoTest=false
 CheckGlCaps=true
 ColorBits=32
-ConsoleMaxLines=8
+ConsoleMaxLines=6
 ConsoleMaxLinesStored=25
 ConsoleTimeout=20
 DataPath=$APPLICATIONDATAPATH/
diff --git a/mk/macos/glest.ini b/mk/macos/glest.ini
index 975365230..885028d5c 100644
--- a/mk/macos/glest.ini
+++ b/mk/macos/glest.ini
@@ -16,7 +16,7 @@ AutoMaxFullScreen=false
 AutoTest=false
 CheckGlCaps=true
 ColorBits=32
-ConsoleMaxLines=8
+ConsoleMaxLines=6
 ConsoleMaxLinesStored=25
 ConsoleTimeout=20
 DataPath=$APPLICATIONDATAPATH/
diff --git a/mk/windows/glest.ini b/mk/windows/glest.ini
index f16f77a2a..1ad881021 100644
--- a/mk/windows/glest.ini
+++ b/mk/windows/glest.ini
@@ -16,7 +16,7 @@ AutoMaxFullScreen=false
 AutoTest=false
 CheckGlCaps=true
 ColorBits=32
-ConsoleMaxLines=7
+ConsoleMaxLines=6
 ConsoleMaxLinesStored=20
 ConsoleTimeout=20
 DataPath=..\..\..\..\data
diff --git a/mk/windows/glest_release.ini b/mk/windows/glest_release.ini
index 3a66d1978..882b91182 100644
--- a/mk/windows/glest_release.ini
+++ b/mk/windows/glest_release.ini
@@ -16,7 +16,7 @@ AutoMaxFullScreen=false
 AutoTest=false
 CheckGlCaps=true
 ColorBits=32
-ConsoleMaxLines=7
+ConsoleMaxLines=6
 ConsoleMaxLinesStored=20
 ConsoleTimeout=20
 DataPath=data
diff --git a/source/glest_game/game/chat_manager.cpp b/source/glest_game/game/chat_manager.cpp
index 320bb980d..ba401b259 100644
--- a/source/glest_game/game/chat_manager.cpp
+++ b/source/glest_game/game/chat_manager.cpp
@@ -57,8 +57,8 @@ namespace
 			thisTeamIndex = -1;
 			disableTeamMode = false;
 			xPos = 75;
-			yPos = 155;
-			maxTextLenght = 90;
+			yPos = 140;
+			maxTextLength = 100;
 			textCharLength.
 				clear();
 			text = "";
@@ -67,7 +67,7 @@ namespace
 			inMenu = false;
 			customCB = NULL;
 			this->
-				maxCustomTextLength = maxTextLenght;
+				maxCustomTextLength = maxTextLength;
 		}
 
 		void
@@ -140,7 +140,7 @@ namespace
 
 			int
 				maxTextLenAllowed =
-				(customCB != NULL ? this->maxCustomTextLength : maxTextLenght);
+				(customCB != NULL ? this->maxCustomTextLength : maxTextLength);
 			string
 				textToAdd =
 				getTextWithLengthCheck(inputText, textCharLength.size(),
@@ -517,7 +517,7 @@ namespace
 				c.keysym.sym, c.keysym.sym);
 
 			// no more textinput with keyPress in SDL2!
-			//      int maxTextLenAllowed = (customCB != NULL ? this->maxCustomTextLength : maxTextLenght);
+			//      int maxTextLenAllowed = (customCB != NULL ? this->maxCustomTextLength : maxTextLength);
 			//      if(editEnabled && (int)text.size() < maxTextLenAllowed) {
 			//              SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line: %d] key = [%c] [%d]\n",__FILE__,__FUNCTION__,__LINE__,c.keysym.sym,c.keysym.sym);
 			//              //space is the first meaningful code
@@ -537,7 +537,7 @@ namespace
 			if (maxCustomTextLength > 0) {
 				this->maxCustomTextLength = maxCustomTextLength;
 			} else {
-				this->maxCustomTextLength = maxTextLenght;
+				this->maxCustomTextLength = maxTextLength;
 			}
 		}
 
@@ -611,7 +611,7 @@ namespace
 			ChatManager::addText(string text) {
 			int
 				maxTextLenAllowed =
-				(customCB != NULL ? this->maxCustomTextLength : maxTextLenght);
+				(customCB != NULL ? this->maxCustomTextLength : maxTextLength);
 			if (editEnabled
 				&& (int) text.size() + (int) this->text.size() <=
 				maxTextLenAllowed) {
diff --git a/source/glest_game/game/chat_manager.h b/source/glest_game/game/chat_manager.h
index 8a58358fb..35a2c3c40 100644
--- a/source/glest_game/game/chat_manager.h
+++ b/source/glest_game/game/chat_manager.h
@@ -96,7 +96,7 @@ namespace
 			int
 				yPos;
 			int
-				maxTextLenght;
+				maxTextLength;
 			Font2D *
 				font;
 			Font3D *
@@ -181,11 +181,11 @@ namespace
 			int
 				getMaxTextLenght() const {
 				return
-					maxTextLenght;
+					maxTextLength;
 			}
 			void
-				setMaxTextLenght(int maxTextLenght) {
-				this->maxTextLenght = maxTextLenght;
+				setMaxTextLenght(int maxTextLength) {
+				this->maxTextLength = maxTextLength;
 			}
 			Font2D *
 				getFont() const {
diff --git a/source/glest_game/game/console.h b/source/glest_game/game/console.h
index 5a55619b3..fc311de14 100644
--- a/source/glest_game/game/console.h
+++ b/source/glest_game/game/console.h
@@ -76,9 +76,6 @@ namespace
 			Console :
 			public
 			FontChangedCallbackInterface {
-		private:
-			static const int
-				consoleLines = 5;
 
 		public:
 
diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index b48be8df6..fb4c1f92b 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -4361,7 +4361,6 @@ namespace Glest {
 			highlightedCells.push_back(mc);
 
 			if (this->masterserverMode == false) {
-				CoreData & coreData = CoreData::getInstance();
 				SoundRenderer & soundRenderer = SoundRenderer::getInstance();
 
 				const Faction *faction = mc.getFaction();
diff --git a/source/glest_game/menu/menu_state_connected_game.cpp b/source/glest_game/menu/menu_state_connected_game.cpp
index 346860f33..369727022 100644
--- a/source/glest_game/menu/menu_state_connected_game.cpp
+++ b/source/glest_game/menu/menu_state_connected_game.cpp
@@ -66,7 +66,7 @@ namespace Glest {
 		const int
 			mapPreviewTexture_X = 5;
 		const int
-			mapPreviewTexture_Y = 185;
+			mapPreviewTexture_Y = 160;
 		const int
 			mapPreviewTexture_W = 150;
 		const int
diff --git a/source/glest_game/menu/menu_state_custom_game.cpp b/source/glest_game/menu/menu_state_custom_game.cpp
index c38958c82..b77651390 100644
--- a/source/glest_game/menu/menu_state_custom_game.cpp
+++ b/source/glest_game/menu/menu_state_custom_game.cpp
@@ -59,7 +59,7 @@ namespace Glest {
 			"data/defaultNetworkGameSetup.mgg";
 
 		const int mapPreviewTexture_X = 5;
-		const int mapPreviewTexture_Y = 185;
+		const int mapPreviewTexture_Y = 160;
 		const int mapPreviewTexture_W = 150;
 		const int mapPreviewTexture_H = 150;
 
diff --git a/source/glest_game/menu/menu_state_root.cpp b/source/glest_game/menu/menu_state_root.cpp
index 344d2651c..237ee613c 100644
--- a/source/glest_game/menu/menu_state_root.cpp
+++ b/source/glest_game/menu/menu_state_root.cpp
@@ -44,7 +44,7 @@ namespace Glest {
 			MainMenu * mainMenu) :MenuState(program,
 				mainMenu,
 				"root"),
-			updatesHttpServerThread(NULL), buttonNewGame("MainMenu",
+			buttonNewGame("MainMenu",
 				"buttonNewGame"),
 			buttonLoadGame("MainMenu", "buttonLoadGame"), buttonMods("MainMenu",
 				"buttonMods"),
@@ -56,7 +56,7 @@ namespace Glest {
 				"mainMessageBox"),
 			errorMessageBox("MainMenu", "errorMessageBox"),
 			ftpMessageBox("MainMenu", "ftpMessageBox"), popupMenu("MainMenu",
-				"popupMenu") {
+				"popupMenu"), updatesHttpServerThread(NULL) {
 			containerName = "MainMenu";
 
 			ftpClientThread = NULL;
diff --git a/source/glest_game/network/network_types.cpp b/source/glest_game/network/network_types.cpp
index 4f0791335..00576466a 100644
--- a/source/glest_game/network/network_types.cpp
+++ b/source/glest_game/network/network_types.cpp
@@ -39,11 +39,11 @@ namespace Glest {
 			, positionX(pos.x)
 			, positionY(pos.y)
 			, wantQueue(wantQueue)
+			, unitFactionUnitCount(0)
+			, unitFactionIndex(0)
 			, commandStateType(commandStateType)
 			, commandStateValue(commandStateValue)
-			, unitCommandGroupId(unitCommandGroupId)
-			, unitFactionUnitCount(0)
-			, unitFactionIndex(0) {
+			, unitCommandGroupId(unitCommandGroupId) {
 
 			assert(targetId == -1 || facing == -1);
 			this->targetId = targetId >= 0 ? targetId : facing;
diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp
index 4325f1086..7f10ef703 100644
--- a/source/glest_game/network/server_interface.cpp
+++ b/source/glest_game/network/server_interface.cpp
@@ -801,8 +801,8 @@ namespace Glest {
 							}
 
 							if ((gameSettings.getNetworkPauseGameForLaggedClients() == false ||
-								(maxFrameCountLagAllowedEver > 0 && clientLagCount > maxFrameCountLagAllowedEver) ||
-								(maxClientLagTimeAllowedEver > 0 && clientLagTime > maxClientLagTimeAllowedEver) &&
+								((maxFrameCountLagAllowedEver > 0 && clientLagCount > maxFrameCountLagAllowedEver) ||
+								(maxClientLagTimeAllowedEver > 0 && clientLagTime > maxClientLagTimeAllowedEver)) &&
 								connectionSlot->getGraceLagCtr() > GRACE_LAG_CTR_LIMIT)) {
 
 								//printf("Closing connection slot lagged out!\n");