diff --git a/stepmania/src/BitmapText.cpp b/stepmania/src/BitmapText.cpp
index ed3ddeeb4b..0bd2f8b368 100644
--- a/stepmania/src/BitmapText.cpp
+++ b/stepmania/src/BitmapText.cpp
@@ -586,7 +586,7 @@ bool BitmapText::StringWillUseAlternate( const CString& sText, const CString& sA
 void BitmapText::SetMaxLines( int iNumLines, int iDirection )
 {
 	iNumLines = MAX( 0, iNumLines );
-	iNumLines = MIN( m_wTextLines.size(), iNumLines );
+	iNumLines = MIN( (int)m_wTextLines.size(), iNumLines );
 	if ( iDirection == 0 ) 
 	{
 		//Crop all bottom lines
diff --git a/stepmania/src/ScreenNameEntryTraditional.cpp b/stepmania/src/ScreenNameEntryTraditional.cpp
index 9f30c3a312..4bce457e57 100644
--- a/stepmania/src/ScreenNameEntryTraditional.cpp
+++ b/stepmania/src/ScreenNameEntryTraditional.cpp
@@ -354,7 +354,7 @@ void ScreenNameEntryTraditional::Init()
 				PROFILEMAN->GetMachineProfile()->GetCourseHighScoreList(pCourse,pTrail) :
 				PROFILEMAN->GetMachineProfile()->GetStepsHighScoreList(pSong,pSteps);
 
-			for( unsigned h=0; h<hsl.vHighScores.size() && h<PREFSMAN->m_iMaxHighScoresPerListForMachine; h++ )
+			for( int h=0; h<(int)hsl.vHighScores.size() && h<PREFSMAN->m_iMaxHighScoresPerListForMachine; h++ )
 			{
 				const HighScore &hs = hsl.vHighScores[h];
 				if( hs.sName == RANKING_TO_FILL_IN_MARKER[p]  &&