diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 8e32eff55f..c8d9f47ccf 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -39,13 +39,13 @@ NextScreen=ScreenSelectStyle
 
 [ScreenEz2SelectPlayer]
 CursorP1X=120
-CursorP1Y=280
+CursorP1Y=360
 CursorP2X=520
-CursorP2Y=280
+CursorP2Y=360
 ControllerP1X=120
-ControllerP1Y=280
+ControllerP1Y=380
 ControllerP2X=520
-ControllerP2Y=280
+ControllerP2Y=380
 HelpText=Press $ on the pad you wish to play on
 TimerSeconds=40
 NextScreen=ScreenSelectGroup
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index 409a747427..d4796be98f 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -214,7 +214,7 @@ ScreenGameplay::ScreenGameplay()
 	};
 
 	// Update possible dance points
-	for( int p=0; p<NUM_PLAYERS; p++ )
+	for( p=0; p<NUM_PLAYERS; p++ )
 	{
 		if( !GAMESTATE->IsPlayerEnabled(p) )
 			continue;	// skip
diff --git a/stepmania/src/ScreenSelectMusic.cpp b/stepmania/src/ScreenSelectMusic.cpp
index eeb0229e17..5f451b517f 100644
--- a/stepmania/src/ScreenSelectMusic.cpp
+++ b/stepmania/src/ScreenSelectMusic.cpp
@@ -341,7 +341,7 @@ void ScreenSelectMusic::TweenOnScreen()
 	m_MusicSortDisplay.SetTweenDiffuseColor( D3DXCOLOR(1,1,1,1) );
 
 	CArray<Actor*,Actor*> apActorsInScore;
-	for( int p=0; p<NUM_PLAYERS; p++ )
+	for( p=0; p<NUM_PLAYERS; p++ )
 	{
 		apActorsInScore.Add( &m_sprHighScoreFrame[p] );
 		apActorsInScore.Add( &m_HighScore[p] );
@@ -401,7 +401,7 @@ void ScreenSelectMusic::TweenOffScreen()
 	m_MusicSortDisplay.SetTweenDiffuseColor( D3DXCOLOR(1,1,1,0) );
 
 	CArray<Actor*,Actor*> apActorsInScore;
-	for( int p=0; p<NUM_PLAYERS; p++ )
+	for( p=0; p<NUM_PLAYERS; p++ )
 	{
 		apActorsInScore.Add( &m_sprHighScoreFrame[p] );
 		apActorsInScore.Add( &m_HighScore[p] );