diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp
index 76b00a475b..abaedfa99c 100644
--- a/stepmania/src/MemoryCardManager.cpp
+++ b/stepmania/src/MemoryCardManager.cpp
@@ -61,7 +61,7 @@ void MemoryCardManager::Update( float fDelta )
 
 		// check for disconnects
 		{
-			for( int i=0; i<vOld.size(); i++ )
+			for( unsigned i=0; i<vOld.size(); i++ )
 			{
 				const UsbStorageDevice old = vOld[i];
 				if( find(vNew.begin(),vNew.end(),old) == vNew.end() )	// didn't find
@@ -74,7 +74,7 @@ void MemoryCardManager::Update( float fDelta )
 
 		// check for connects
 		{
-			for( int i=0; i<vNew.size(); i++ )
+			for( unsigned i=0; i<vNew.size(); i++ )
 			{
 				const UsbStorageDevice newd = vNew[i];
 				if( find(vOld.begin(),vOld.end(),newd) == vOld.end() )	// didn't find
diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 2864940edf..a228e857a6 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -395,7 +395,7 @@ void NoteDataUtil::RemoveHands(NoteData &in, float fStartBeat, float fEndBeat)
 			}
 			else if( in.GetTapNote(t,r) == TAP_HOLD_HEAD )
 			{
-				unsigned i;
+				int i;
 				for( i=0; i<in.GetNumHoldNotes(); i++ )
 				{
 					const HoldNote& hn = in.GetHoldNote(i);
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index edc007795f..bdbc82f1ea 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -146,7 +146,7 @@ Grade StageStats::GetGrade( PlayerNumber pn ) const
 	 * is tricky since at that point the ScoreKeepers no longer exist. 
 	 *
 	 * See http://www.aaroninjapan.com/ddr2.html ("Regular play scoring") */
-	float TapScoreValues[NUM_TAP_NOTE_SCORES] = 
+	int TapScoreValues[NUM_TAP_NOTE_SCORES] = 
 	{ 
 		0,
 		PREFSMAN->m_iGradeHitMineWeight,
@@ -157,7 +157,7 @@ Grade StageStats::GetGrade( PlayerNumber pn ) const
 		PREFSMAN->m_iGradePerfectWeight,
 		PREFSMAN->m_iGradeMarvelousWeight,
 	};
-	float HoldScoreValues[NUM_HOLD_NOTE_SCORES] =
+	int HoldScoreValues[NUM_HOLD_NOTE_SCORES] =
 	{
 		0,
 		PREFSMAN->m_iGradeNGWeight,