diff --git a/Scripting/ERM/ERM.vcxproj b/Scripting/ERM/ERM.vcxproj
index 172f6a34f..7b7e5a3ec 100644
--- a/Scripting/ERM/ERM.vcxproj
+++ b/Scripting/ERM/ERM.vcxproj
@@ -92,7 +92,7 @@
       <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
-      <AdditionalOptions>/Zm207 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zm218 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/lib/CCreatureHandler.h b/lib/CCreatureHandler.h
index 8294db411..1ad65dd15 100644
--- a/lib/CCreatureHandler.h
+++ b/lib/CCreatureHandler.h
@@ -6,7 +6,6 @@
 #include "ResourceSet.h"
 #include "GameConstants.h"
 #include "JsonNode.h"
-#include "../client/CMusicHandler.h"
 
 /*
  * CCreatureHandler.h, part of VCMI engine
diff --git a/lib/CGeneralTextHandler.cpp b/lib/CGeneralTextHandler.cpp
index 1aa162eb0..654c06ddd 100644
--- a/lib/CGeneralTextHandler.cpp
+++ b/lib/CGeneralTextHandler.cpp
@@ -383,9 +383,8 @@ void CGeneralTextHandler::load()
 		do
 		{
 			text = parser.readString();
-			parser.endLine();
 			if (!text.empty())
-				campaignMapNames.push_back(parser.readString());
+				campaignMapNames.push_back(text);
 		}
 		while (parser.endLine() && !text.empty());
 
@@ -401,9 +400,8 @@ void CGeneralTextHandler::load()
 			do
 			{
 				text = parser.readString();
-				parser.endLine();
 				if (!text.empty())
-					campaignRegionNames.back().push_back(parser.readString());
+					campaignRegionNames.back().push_back(text);
 			}
 			while (parser.endLine() && !text.empty());
 		}
diff --git a/server/CGameHandler.cpp b/server/CGameHandler.cpp
index ea8be91cf..1cc70c7e3 100644
--- a/server/CGameHandler.cpp
+++ b/server/CGameHandler.cpp
@@ -3356,8 +3356,8 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
 				break;
 			}
 			
+			BattleHex startingPos = stack->position;
 			int distance = moveStack(ba.stackNumber, ba.destinationTile);
-			int startingPos = stack->position;
 			
 			tlog5 << stack->nodeName() << " will attack " << stackAtEnd->nodeName() << std::endl;
 
@@ -3418,7 +3418,7 @@ bool CGameHandler::makeBattleAction( BattleAction &ba )
 			}
 
 			//second attack
-			if(stack //FIXME: clones tend to dissapear during actions
+			if(stack //FIXME: clones tend to disapear during actions
 				&& stack->valOfBonuses(Bonus::ADDITIONAL_ATTACK) > 0
 				&& !stack->hasBonusOfType(Bonus::SHOOTER)
 				&& stack->alive()