diff --git a/stepmania/src/ActiveAttackList.cpp b/stepmania/src/ActiveAttackList.cpp
index eba72a70da..f1c693b0ea 100644
--- a/stepmania/src/ActiveAttackList.cpp
+++ b/stepmania/src/ActiveAttackList.cpp
@@ -52,7 +52,7 @@ void ActiveAttackList::Update( float fDelta )
 			CString sMods = attack.sModifier;
 			CStringArray asMods;
 			split( sMods, ", ", asMods );
-			for( int j=0; j<asMods.size(); j++ )
+			for( unsigned j=0; j<asMods.size(); j++ )
 			{
 				CString& sMod = asMods[j];
 
@@ -75,7 +75,7 @@ void ActiveAttackList::Update( float fDelta )
 				CStringArray asTokens;
 				split( sMod, " ", asTokens );
 				sMod.erase( sMod.begin(), sMod.end() );
-				for( int i=0; i<asTokens.size(); i++ )
+				for( unsigned i=0; i<asTokens.size(); i++ )
 					sMod += Capitalize( asTokens[i] ) + " ";
 				
 				if( s.empty() )
diff --git a/stepmania/src/ScreenBranch.cpp b/stepmania/src/ScreenBranch.cpp
index 98fac2f332..58daf1aa36 100644
--- a/stepmania/src/ScreenBranch.cpp
+++ b/stepmania/src/ScreenBranch.cpp
@@ -30,7 +30,7 @@ ScreenBranch::ScreenBranch( CString sClassName ) : Screen( sClassName )
 	for( unsigned i=0; i<as.size(); i++ )
 	{
 		CString sChoice = Capitalize( as[i] );
-		CString sCondition = CONDITION(sChoice);
+			CString sCondition = CONDITION(sChoice);
 
 		if( Lua::RunExpression(sCondition) )
 		{