diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 76314221ae..ba92254303 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1396,14 +1396,14 @@ void ScreenGameplay::UpdateAutoPlayText()
 void SaveChanges( void* papSongsQueue )
 {
 	vector<Song*>& apSongsQueue = *(vector<Song*>*)papSongsQueue;
-	for( int i=0; i<apSongsQueue.size(); i++ )
+	for( unsigned i=0; i<apSongsQueue.size(); i++ )
 		apSongsQueue[i]->Save();
 }
 
 void RevertChanges( void* papSongsQueue )
 {
 	vector<Song*>& apSongsQueue = *(vector<Song*>*)papSongsQueue;
-	for( int i=0; i<apSongsQueue.size(); i++ )
+	for( unsigned i=0; i<apSongsQueue.size(); i++ )
 		apSongsQueue[i]->RevertFromDisk();
 }
 
diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index b81233037b..d11105296c 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -130,7 +130,7 @@ void ScreenOptions::Init( InputMode im, OptionRow OptionRow[], int iNumOptionLin
 		m_framePage.AddChild( &m_textTitles[r] );		
 
 		int iNumChoices = min( m_OptionRow[r].choices.size(), MAX_VISIBLE_VALUES_PER_LINE );
-		for( unsigned c=0; c<iNumChoices; c++ )
+		for( int c=0; c<iNumChoices; c++ )
 		{
 			m_framePage.AddChild( &m_textItems[r][c] );
 		}