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/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;