diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp
index cfec27dc07..9a7d32e2be 100644
--- a/stepmania/src/OptionRowHandler.cpp
+++ b/stepmania/src/OptionRowHandler.cpp
@@ -26,8 +26,9 @@
 
 static void SelectExactlyOne( int iSelection, vector<bool> &vbSelectedOut )
 {
-	ASSERT_M( iSelection >= 0  &&  iSelection < (int) vbSelectedOut.size(), ssprintf("%d/%u",iSelection,vbSelectedOut.size()) );
-	for( int i=0; i<(int)vbSelectedOut.size(); i++ )
+	ASSERT_M( iSelection >= 0  &&  iSelection < (int) vbSelectedOut.size(),
+			  ssprintf("%d/%u",iSelection, unsigned(vbSelectedOut.size())) );
+	for( int i=0; i<int(vbSelectedOut.size()); i++ )
 		vbSelectedOut[i] = i==iSelection;
 }
 
diff --git a/stepmania/src/PrefsManager.cpp b/stepmania/src/PrefsManager.cpp
index 87ded68d14..94a6cd3590 100644
--- a/stepmania/src/PrefsManager.cpp
+++ b/stepmania/src/PrefsManager.cpp
@@ -141,9 +141,9 @@ PrefsManager::PrefsManager() :
 	m_iPercentScoreWeightGood		( Options, "PercentScoreWeightGood",		0 ),
 	m_iPercentScoreWeightBoo		( Options, "PercentScoreWeightBoo",			0 ),
 	m_iPercentScoreWeightMiss		( Options, "PercentScoreWeightMiss",		0 ),
+	m_iPercentScoreWeightHitMine	( Options, "PercentScoreWeightHitMine",		-2 ),
 	m_iPercentScoreWeightOK			( Options, "PercentScoreWeightOK",			3 ),
 	m_iPercentScoreWeightNG			( Options, "PercentScoreWeightNG",			0 ),
-	m_iPercentScoreWeightHitMine	( Options, "PercentScoreWeightHitMine",		-2 ),
 	
 	m_iGradeWeightMarvelous		( Options, "GradeWeightMarvelous",	2 ),
 	m_iGradeWeightPerfect		( Options, "GradeWeightPerfect",	2 ),
@@ -179,8 +179,8 @@ PrefsManager::PrefsManager() :
 	m_bAutoPlay					( Options, "AutoPlay",					false ),
 	m_bDelayedBack				( Options, "DelayedBack",				true ),
 	m_bShowInstructions			( Options, "ShowInstructions",			true ),
-	m_bShowCaution				( Options, "ShowCaution",				true ),
 	m_bShowSelectGroup			( Options, "ShowSelectGroup",			true ),
+	m_bShowCaution				( Options, "ShowCaution",				true ),
 	m_bShowNativeLanguage		( Options, "ShowNativeLanguage",		true ),
 	m_bArcadeOptionsNavigation	( Options, "ArcadeOptionsNavigation",	false ),
 	m_MusicWheelUsesSections	( Options, "MusicWheelUsesSections",	ALWAYS ),