diff --git a/client/CBattleInterface.cpp b/client/CBattleInterface.cpp
index 0ee4104c6..042262186 100644
--- a/client/CBattleInterface.cpp
+++ b/client/CBattleInterface.cpp
@@ -3424,10 +3424,10 @@ void CBattleInterface::showPieceOfWall(SDL_Surface * to, int hex, const std::vec
 		return;
 
 	using namespace boost::assign;
-	static const std::map<int, std::list<int>> hexToPart = map_list_of<int, std::list<int>>(12, list_of<int>(8)(1)(7))(45, list_of<int>(12)(6))
+	static const std::map<int, std::list<int> > hexToPart = map_list_of<int, std::list<int> >(12, list_of<int>(8)(1)(7))(45, list_of<int>(12)(6))
 		/*gate (78, list_of<int>(9))*/(101, list_of<int>(10))(118, list_of<int>(2))(165, list_of<int>(11))(186, list_of<int>(3));
 
-	std::map<int, std::list<int>>::const_iterator it = hexToPart.find(hex);
+	std::map<int, std::list<int> >::const_iterator it = hexToPart.find(hex);
 	if(it != hexToPart.end())
 	{
 		BOOST_FOREACH(int wallNum, it->second)
diff --git a/lib/ERMInterpreter.cpp b/lib/ERMInterpreter.cpp
index ff1926258..9dee64c92 100644
--- a/lib/ERMInterpreter.cpp
+++ b/lib/ERMInterpreter.cpp
@@ -653,7 +653,7 @@ struct StandardReceiverVisitor : boost::static_visitor<>
 		{
 			ERM::TBodyOptionItem boi = params[0];
 			boost::apply_visitor(
-				OptionPerformer(*const_cast<OptionPerformer::TReceiverType*>(static_cast<const OptionPerformer::TReceiverType*>(this))), boi);
+				OptionPerformer(*const_cast<typename OptionPerformer::TReceiverType*>(static_cast<const typename OptionPerformer::TReceiverType*>(this))), boi);
 		}
 		else
 			throw EScriptExecError("This receiver option takes exactly 1 parameter!");
@@ -671,7 +671,7 @@ struct StandardReceiverVisitor : boost::static_visitor<>
 			{
 			case 0:
 				boost::apply_visitor(
-					OptionPerformer<0>(*const_cast<OptionPerformer<0>::TReceiverType*>(static_cast<const OptionPerformer<0>::TReceiverType*>(this))), boi);
+					OptionPerformer<0>(*const_cast<typename OptionPerformer<0>::TReceiverType*>(static_cast<const typename OptionPerformer<0>::TReceiverType*>(this))), boi);
 				break;
 			default:
 				throw EScriptExecError("Wrong number of option code!");
diff --git a/lib/ERMInterpreter.h b/lib/ERMInterpreter.h
index 257ea78c2..329c6e7c8 100644
--- a/lib/ERMInterpreter.h
+++ b/lib/ERMInterpreter.h
@@ -551,6 +551,6 @@ public:
 		if(obj)
 			return obj;
 		else
-			throw EScriptExecError("Wrong cast attempted, object is not of a desired type!");
+			throw VERMInterpreter::EScriptExecError("Wrong cast attempted, object is not of a desired type!");
 	}
 };