diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp
index e4261ebdcb..4a5ed97300 100644
--- a/stepmania/src/ScreenPlayerOptions.cpp
+++ b/stepmania/src/ScreenPlayerOptions.cpp
@@ -530,11 +530,11 @@ float ScreenPlayerOptions::ConvertModToNumber(CString value)
 {
 	if (IsModTimeSpacing(value))
 	{
-		return atof(value.c_str() + 1 );
+		return (float) atof(value.c_str() + 1 );
 	}
 	else
 	{
-		return atof(value.c_str() );
+		return (float) atof(value.c_str() );
 	}
 }
 
diff --git a/stepmania/src/ScreenSelectDifficulty.cpp b/stepmania/src/ScreenSelectDifficulty.cpp
index 89d8f683e7..bb4ad60d00 100644
--- a/stepmania/src/ScreenSelectDifficulty.cpp
+++ b/stepmania/src/ScreenSelectDifficulty.cpp
@@ -220,7 +220,7 @@ void ScreenSelectDifficulty::MenuRight( PlayerNumber pn )
 		return;
 
 	int iSwitchToIndex = -1;
-	for( int i=m_iChoiceOnPage[pn]+1; i<m_ModeChoices[m_CurrentPage].size(); i++ )
+	for( int i=m_iChoiceOnPage[pn]+1; i<(int) m_ModeChoices[m_CurrentPage].size(); i++ )
 	{
 		if( GAMESTATE->IsPlayable(m_ModeChoices[m_CurrentPage][i]))
 		{
@@ -273,7 +273,7 @@ void ScreenSelectDifficulty::ChangePage( Page newPage )
 			}
 		}
 	} else {
-		for( int i=0; i<m_ModeChoices[newPage].size(); i++ )
+		for( unsigned i=0; i<m_ModeChoices[newPage].size(); i++ )
 		{
 			if( GAMESTATE->IsPlayable(m_ModeChoices[newPage][i]))
 			{