diff --git a/Utils/XMLWriter.cpp b/Utils/XMLWriter.cpp
index 8b1c407a7..8e5ed8857 100644
--- a/Utils/XMLWriter.cpp
+++ b/Utils/XMLWriter.cpp
@@ -75,7 +75,7 @@ bool XMLWriter::writeToFile(vfs::tWritableFile* pFile)
 	try
 	{
 		vfs::COpenWriteFile file(pFile);
-		std::string &str = m_ssBuffer.str();
+		const std::string str = m_ssBuffer.str();
 		pFile->write(str.c_str(), str.length() * sizeof(std::string::value_type));
 		return true;
 	}
diff --git a/i18n/ExportStrings.cpp b/i18n/ExportStrings.cpp
index 6109ebe07..daedb0458 100644
--- a/i18n/ExportStrings.cpp
+++ b/i18n/ExportStrings.cpp
@@ -524,7 +524,8 @@ void ExportMercBio()
 		Translate(pAddInfo, SIZE_MERC_ADDITIONAL_INFO, g_lang);
 		props.setStringProperty(L"Add", vfs::toString<wchar_t>(i), pAddInfo);
 	}
-	props.writeToXMLFile(L"Localization/AimBiographies.xml", vfs::PropertyContainer::TagMap());
+	vfs::PropertyContainer::TagMap tags;
+	props.writeToXMLFile(L"Localization/AimBiographies.xml", tags);
 }
 
 void ExportAIMHistory()
@@ -544,7 +545,8 @@ void ExportAIMHistory()
 		Translate(pHistLine, AIM_HISTORY_LINE_SIZE, g_lang);
 		props.setStringProperty(L"Line", vfs::toString<wchar_t>(i), pHistLine);
 	}
-	props.writeToXMLFile(L"Localization/AimHistory.xml", vfs::PropertyContainer::TagMap());
+	vfs::PropertyContainer::TagMap tags;
+	props.writeToXMLFile(L"Localization/AimHistory.xml", tags);
 }
 	
 	
@@ -565,7 +567,8 @@ void ExportAIMPolicy()
 		Translate(pPolLine, AIM_HISTORY_LINE_SIZE, g_lang);
 		props.setStringProperty(L"Line", vfs::toString<wchar_t>(i), pPolLine);
 	}
-	props.writeToXMLFile(L"Localization/AimPolicy.xml", vfs::PropertyContainer::TagMap());
+	vfs::PropertyContainer::TagMap tags;
+	props.writeToXMLFile(L"Localization/AimPolicy.xml", tags);
 }
 
 void ExportAlumniName()
@@ -585,7 +588,8 @@ void ExportAlumniName()
 		Translate(pAlumniName, AIM_ALUMNI_NAME_SIZE, g_lang);
 		props.setStringProperty(L"Line", vfs::toString<wchar_t>(i), pAlumniName);
 	}
-	props.writeToXMLFile(L"Localization/AlumniName.xml", vfs::PropertyContainer::TagMap());
+	vfs::PropertyContainer::TagMap tags;
+	props.writeToXMLFile(L"Localization/AlumniName.xml", tags);
 }
 
 void ExportDialogues()
@@ -621,7 +625,8 @@ void ExportDialogues()
 		}
 		vfs::Path x(L"Localization/Dialogue");
 		x += vfs::Path(file.getName().c_wcs() + L".xml");
-		props.writeToXMLFile(x, vfs::PropertyContainer::TagMap());
+		vfs::PropertyContainer::TagMap tags;
+		props.writeToXMLFile(x, tags);
 	}
 }
 
@@ -668,7 +673,8 @@ void ExportNPCDialogues()
 		}
 		vfs::Path x(L"Localization/NpcDialogue");
 		x += vfs::Path(file.getName().c_wcs() + L".xml");
-		props.writeToXMLFile(x, vfs::PropertyContainer::TagMap());
+		vfs::PropertyContainer::TagMap tags;
+		props.writeToXMLFile(x, tags);
 	}
 }
 } // namespace
diff --git a/i18n/LocalizedStrings.cpp b/i18n/LocalizedStrings.cpp
index 62153401f..fb9f6940b 100644
--- a/i18n/LocalizedStrings.cpp
+++ b/i18n/LocalizedStrings.cpp
@@ -86,13 +86,15 @@ void Loc::Init(Topic t, vfs::String const& section)
 	_PropState& state = _topicFiles[t][L"_ALL"];
 	if(!state.filename.empty() && !state.loaded)
 	{
-		_localizedStrings[t].initFromXMLFile(state.filename, vfs::PropertyContainer::TagMap());
+		vfs::PropertyContainer::TagMap tags;
+		_localizedStrings[t].initFromXMLFile(state.filename, tags);
 		state.loaded = true;
 	}
 	state = _topicFiles[t][section];
 	if(!state.filename.empty() && !state.loaded)
 	{
-		_localizedStrings[t].initFromXMLFile(state.filename, vfs::PropertyContainer::TagMap());
+		vfs::PropertyContainer::TagMap tags;
+		_localizedStrings[t].initFromXMLFile(state.filename, tags);
 		state.loaded = true;
 	}
 }