diff --git a/stepmania/src/ScreenOptions.cpp b/stepmania/src/ScreenOptions.cpp
index e972847123..14da4e93ab 100644
--- a/stepmania/src/ScreenOptions.cpp
+++ b/stepmania/src/ScreenOptions.cpp
@@ -440,7 +440,7 @@ void ScreenOptions::PositionCursors()
 		cursor.SetBarWidth( iWidth );
 		cursor.SetXY( (float)iX, (float)iY );
 		bool bCanGoLeft = iChoiceWithFocus > 0;
-		bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < row.GetRowDef().m_vsChoices.size()-1;
+		bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < (int) row.GetRowDef().m_vsChoices.size()-1;
 		cursor.SetCanGo( bCanGoLeft, bCanGoRight );
 	}
 }
@@ -470,7 +470,7 @@ void ScreenOptions::TweenCursor( PlayerNumber pn )
 
 
 	bool bCanGoLeft = iChoiceWithFocus > 0;
-	bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < row.GetRowDef().m_vsChoices.size()-1;
+	bool bCanGoRight = iChoiceWithFocus >= 0 && iChoiceWithFocus < (int) row.GetRowDef().m_vsChoices.size()-1;
 	cursor.SetCanGo( bCanGoLeft, bCanGoRight );
 
 	if( GAMESTATE->IsHumanPlayer(pn) )  
diff --git a/stepmania/src/ScreenOptionsEditCourseEntry.cpp b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
index dc9fdaad94..20b2ff68de 100644
--- a/stepmania/src/ScreenOptionsEditCourseEntry.cpp
+++ b/stepmania/src/ScreenOptionsEditCourseEntry.cpp
@@ -195,7 +195,7 @@ void ScreenOptionsEditCourseEntry::AfterChangeValueInRow( int iRow, PlayerNumber
 	GAMESTATE->m_pCurTrail[PLAYER_1].Set( NULL );
 	Trail *pTrail = pCourse->GetTrailForceRegenCache( GAMESTATE->m_stEdit, GAMESTATE->m_PreferredCourseDifficulty[PLAYER_1] );
 	int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex;
-	ASSERT( iEntryIndex >= 0 && iEntryIndex < pCourse->m_vEntries.size() );
+	ASSERT( iEntryIndex >= 0 && iEntryIndex < (int) pCourse->m_vEntries.size() );
 	CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ];
 
 	switch( iRow )
@@ -238,7 +238,7 @@ void ScreenOptionsEditCourseEntry::ImportOptions( int iRow, const vector<PlayerN
 {
 	Course *pCourse = GAMESTATE->m_pCurCourse;
 	int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex;
-	ASSERT( iEntryIndex >= 0 && iEntryIndex < pCourse->m_vEntries.size() );
+	ASSERT( iEntryIndex >= 0 && iEntryIndex < (int) pCourse->m_vEntries.size() );
 	CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ];
 
 	OptionRow &row = *m_pRows[iRow];
@@ -315,7 +315,7 @@ void ScreenOptionsEditCourseEntry::ExportOptions( int iRow, const vector<PlayerN
 {
 	Course *pCourse = GAMESTATE->m_pCurCourse;
 	int iEntryIndex = GAMESTATE->m_iEditCourseEntryIndex;
-	ASSERT( iEntryIndex >= 0 && iEntryIndex < pCourse->m_vEntries.size() );
+	ASSERT( iEntryIndex >= 0 && iEntryIndex < (int) pCourse->m_vEntries.size() );
 	CourseEntry &ce = pCourse->m_vEntries[ iEntryIndex ];
 
 	switch( iRow )