diff --git a/src/BitmapText.cpp b/src/BitmapText.cpp
index 465635981d..ebb975973c 100644
--- a/src/BitmapText.cpp
+++ b/src/BitmapText.cpp
@@ -90,6 +90,7 @@ BitmapText & BitmapText::operator=(const BitmapText &cpy)
 	CPY( m_fDistortion );
 	CPY( m_bUsingDistortion );
 	CPY( m_iVertSpacing );
+	CPY( m_MaxDimensionUsesZoom );
 	CPY( m_aVertices );
 	CPY( m_vpFontPageTextures );
 	CPY( m_mAttributes );
diff --git a/src/LuaManager.cpp b/src/LuaManager.cpp
index 39eb6b452d..3e703474fb 100644
--- a/src/LuaManager.cpp
+++ b/src/LuaManager.cpp
@@ -807,7 +807,7 @@ Dialog::Result LuaHelpers::ReportScriptError(RString const& Error, RString Error
 		ScriptErrorMessage(Error);
 		InReportScriptError= false;
 	}
-	LOG->Warn(Error.c_str());
+	LOG->Warn( "%s", Error.c_str());
 	if(UseAbort)
 	{
 		RString with_correct= Error + "  Correct this and click Retry, or Cancel to break.";
diff --git a/src/ScreenEdit.cpp b/src/ScreenEdit.cpp
index 127daa46f8..315d2a8ade 100644
--- a/src/ScreenEdit.cpp
+++ b/src/ScreenEdit.cpp
@@ -4546,7 +4546,7 @@ static bool ConvertMappingInputToMapping(RString const& mapstr, int* mapping, RS
 {
 	vector<RString> mapping_input;
 	split(mapstr, ",", mapping_input);
-	int tracks_for_type= GAMEMAN->GetStepsTypeInfo(GAMESTATE->m_pCurSteps[0]->m_StepsType).iNumTracks;
+	size_t tracks_for_type= GAMEMAN->GetStepsTypeInfo(GAMESTATE->m_pCurSteps[0]->m_StepsType).iNumTracks;
 	if(mapping_input.size() > tracks_for_type)
 	{
 		error= TOO_MANY_TRACKS;
@@ -4568,7 +4568,7 @@ static bool ConvertMappingInputToMapping(RString const& mapstr, int* mapping, RS
 			error= ssprintf(NOT_A_TRACK.GetValue(), mapping_input[track].c_str());
 			return false;
 		}
-		if(mapping[track] < 1 || mapping[track] > tracks_for_type)
+		if(mapping[track] < 1 || mapping[track] > static_cast<int>(tracks_for_type))
 		{
 			error= ssprintf(OUT_OF_RANGE_ID.GetValue(), track+1, mapping[track], tracks_for_type);
 			return false;
diff --git a/src/ThemeManager.cpp b/src/ThemeManager.cpp
index 9f5e6bc6e5..f7aade0692 100644
--- a/src/ThemeManager.cpp
+++ b/src/ThemeManager.cpp
@@ -816,12 +816,12 @@ try_element_again:
 		goto try_element_again;
 	case Dialog::ignore:
 		{
-			RString error= sCategory + '/' + sFileName +
-				" could not be found in \"" +
-				GetThemeDirFromName(m_sCurThemeName).c_str() + "\" or \"" +
-				GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME).c_str() + "\".";
-			LOG->UserLog("Theme element", "%s", error.c_str());
-			LOG->Warn(error.c_str());
+			RString element = sCategory + '/' + sFileName;
+			RString error = "could not be found in \"" +
+				GetThemeDirFromName(m_sCurThemeName) + "\" or \"" +
+				GetThemeDirFromName(SpecialFiles::BASE_THEME_NAME) + "\".";
+			LOG->UserLog("Theme element", element.c_str(), "%s", error.c_str());
+			LOG->Warn( "%s %s", element.c_str(), error.c_str());
 			LuaHelpers::ScriptErrorMessage(error);
 		}