diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index 34ab0a1e2c..02b88102f9 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -761,12 +761,12 @@ void GameState::GetRankingFeats( PlayerNumber pn, CStringArray &asFeatsOut, vect
 			int i;
 
 			StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_StepsType;
-			for( i=0; i<m_vPlayedStageStats.size(); i++ )
+			for( i=0; i<(int)m_vPlayedStageStats.size(); i++ )
 			{
 				Song* pSong = m_vPlayedStageStats[i].pSong;
 				Steps* pSteps = m_vPlayedStageStats[i].pSteps[pn];
 				vector<Steps::MemCardData::HighScore> &vHighScores = pSteps->m_MemCardDatas[MEMORY_CARD_MACHINE].vHighScores;
-				for( int j=0; j<vHighScores.size(); j++ )
+				for( unsigned j=0; j<vHighScores.size(); j++ )
 				{
 					if( vHighScores[j].sName == RANKING_TO_FILL_IN_MARKER[pn] )
 					{
@@ -785,7 +785,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, CStringArray &asFeatsOut, vect
 			for( i=0; i<NUM_RANKING_CATEGORIES; i++ )
 			{
 				vector<SongManager::CategoryData::HighScore> &vHighScores = SONGMAN->m_CategoryDatas[nt][i].vHighScores;
-				for( int j=0; j<vHighScores.size(); j++ )
+				for( unsigned j=0; j<vHighScores.size(); j++ )
 				{
 					CString s = ssprintf("No. %d in Type %c (%d)", j+1, 'A'+i, stats.iMeter[pn] );
 					vpStringsToFillOut.push_back( &vHighScores[j].sName );
@@ -803,7 +803,7 @@ void GameState::GetRankingFeats( PlayerNumber pn, CStringArray &asFeatsOut, vect
 			StepsType nt = GAMESTATE->GetCurrentStyleDef()->m_StepsType;
 			Course* pCourse = GAMESTATE->m_pCurCourse;
 			vector<Course::MemCardData::HighScore> &vHighScores = pCourse->m_MemCardDatas[nt][MEMORY_CARD_MACHINE].vHighScores;
-			for( int i=0; i<vHighScores.size(); i++ )
+			for( unsigned i=0; i<vHighScores.size(); i++ )
 			{
 				if( vHighScores[i].sName == RANKING_TO_FILL_IN_MARKER[pn] )
 				{
@@ -824,7 +824,7 @@ void GameState::StoreRankingName( PlayerNumber pn, CString name )
 	vector<CString*> vpStringsToFill;
 	CStringArray asFeats;
 	GetRankingFeats( pn, asFeats, vpStringsToFill );
-	for( int i=0; i<vpStringsToFill.size(); i++ )
+	for( unsigned i=0; i<vpStringsToFill.size(); i++ )
 	{
 		(*vpStringsToFill[i]) = name;
 	}
diff --git a/stepmania/src/RageDisplay.cpp b/stepmania/src/RageDisplay.cpp
index b6e91bbc93..8027f3eae7 100644
--- a/stepmania/src/RageDisplay.cpp
+++ b/stepmania/src/RageDisplay.cpp
@@ -625,7 +625,7 @@ void RageDisplay::ChangeCentering( int trans_x, int trans_y, float scale_x, floa
 {
 	RageMatrix m1;
 	RageMatrix m2;
-	RageMatrixTranslation( &m1, trans_x, trans_y, 0 );
+	RageMatrixTranslation( &m1, float(trans_x), float(trans_y), 0 );
 	RageMatrixScaling( &m2, scale_x, scale_y, 1 );
 	RageMatrixMultiply( &m_Centering, &m1, &m2 );
 }
diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp
index bb324b0da3..ec58b2c105 100644
--- a/stepmania/src/ScreenEvaluation.cpp
+++ b/stepmania/src/ScreenEvaluation.cpp
@@ -217,7 +217,6 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
 
 				float fAverageMeter = stageStats.iMeter[p] / (float)PREFSMAN->m_iNumArcadeStages;
 				rc[p] = AverageMeterToRankingCategory( fAverageMeter );
-				float fTotalDP = stageStats.iActualDancePoints[p];
 
 				SongManager::CategoryData::HighScore hs;
 				hs.iScore = stageStats.iScore[p];
@@ -225,7 +224,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : Screen(sClassName)
 
 				// If unlocking is enabled, save the dance points
 				if( PREFSMAN->m_bUseUnlockSystem )
-					UNLOCKSYS->UnlockAddDP( fTotalDP );
+					UNLOCKSYS->UnlockAddDP( stageStats.iActualDancePoints[p] );
 			}
 			break;
 		case course: