diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index 1bf985b606..a7b52ca450 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -189,7 +189,7 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
 
 	// init m_textItems from optionLines
 	{
-		for( int r=0; r<m_Rows.size(); r++ )		// foreach row
+		for( unsigned  r=0; r<m_Rows.size(); r++ )		// foreach row
 		{
 			Row &row = *m_Rows[r];
 			row.Type = Row::ROW_NORMAL;
@@ -300,10 +300,10 @@ void ScreenOptions::Init( InputMode im, OptionRowData OptionRows[], int iNumOpti
 			// Add children here and not above because of the logic that starts
 			// over if we run off the right edge of the screen.
 			{
-				for( int c=0; c<textItems.size(); c++ )
+				for( unsigned c=0; c<textItems.size(); c++ )
 					m_framePage.AddChild( textItems[c] );
 				for( int p=0; p<NUM_PLAYERS; p++ )
-					for( int c=0; c<row.m_Underline[p].size(); c++ )
+					for( unsigned c=0; c<row.m_Underline[p].size(); c++ )
 						m_framePage.AddChild( row.m_Underline[p][c] );
 			}
 		}
@@ -590,7 +590,7 @@ void ScreenOptions::PositionUnderlines()
 			}
 			else	// !row.m_bRowIsLong
 			{
-				for( int i=0; i<vpUnderlines.size(); i++ )
+				for( unsigned i=0; i<vpUnderlines.size(); i++ )
 				{
 					OptionsCursor& ul = *vpUnderlines[i];
 
diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 7b5dc29a31..2510d51ed2 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -576,7 +576,7 @@ void ScreenOptionsMaster::RefreshIcons()
 		if( !GAMESTATE->IsHumanPlayer(p) )
 			continue;
 
-		for( int i=0; i<m_Rows.size(); i++ )	// foreach options line
+        for( unsigned i=0; i<m_Rows.size(); ++i )     // foreach options line
 		{
 			if( m_Rows[i]->Type == Row::ROW_EXIT )
 				continue;	// skip