diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 9efa4a32f3..95aa188b52 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -164,7 +164,7 @@ void EditMenu::RefreshAll()
 				}
 			}
 
-			for( int i=0; i<m_vpSteps.size(); i++ )
+			for( unsigned i=0; i<m_vpSteps.size(); i++ )
 			{
 				const Steps *pSteps = m_vpSteps[i];
 				if( pSteps == GAMESTATE->m_pCurSteps[PLAYER_1] )
diff --git a/stepmania/src/Song.cpp b/stepmania/src/Song.cpp
index f5dc50fc3d..cf3d5469b2 100644
--- a/stepmania/src/Song.cpp
+++ b/stepmania/src/Song.cpp
@@ -1425,7 +1425,6 @@ void Song::MakeUniqueEditDescription( StepsType st, CString &sPreferredDescripti
 	if( IsEditDescriptionUnique( m_vpSteps, st, sPreferredDescriptionInOut ) )
 		return;
 
-	int i=0;
 	CString sTemp;
 
 	for( int i=0; i<1000; i++ )