diff --git a/source/glest_game/global/core_data.cpp b/source/glest_game/global/core_data.cpp
index 863dc706..01bda2ab 100644
--- a/source/glest_game/global/core_data.cpp
+++ b/source/glest_game/global/core_data.cpp
@@ -1173,10 +1173,10 @@ void CoreData::unRegisterFontChangedCallback(std::string entityName) {
 	}
 }
 void CoreData::triggerFontChangedCallbacks(std::string fontUniqueId, Font *font) {
-	for (std::map<std::string, std::vector<FontChangedCallbackInterface *>>::const_iterator iterMap = 
+	for (std::map<std::string, std::vector<FontChangedCallbackInterface *> >::const_iterator iterMap =
 		registeredFontChangedCallbacks.begin();
 		iterMap != registeredFontChangedCallbacks.end(); iterMap++) {
-		for (int index = 0; index < iterMap->second.size(); ++index) {
+		for (unsigned int index = 0; index < iterMap->second.size(); ++index) {
 			FontChangedCallbackInterface *cb = iterMap->second[index];
 			cb->FontChangedCallback(fontUniqueId, font);
 		}
diff --git a/source/glest_game/global/core_data.h b/source/glest_game/global/core_data.h
index 29322ed8..30141da5 100644
--- a/source/glest_game/global/core_data.h
+++ b/source/glest_game/global/core_data.h
@@ -114,7 +114,7 @@ private:
 	string battleEndLoseVideoFilenameFallback;
 	string battleEndLoseMusicFilename;
 
-	std::map<std::string,std::vector<FontChangedCallbackInterface *>> registeredFontChangedCallbacks;
+	std::map<std::string,std::vector<FontChangedCallbackInterface *> > registeredFontChangedCallbacks;
 public:
 
 	enum TextureSystemType {