diff --git a/stepmania/src/ActorScroller.cpp b/stepmania/src/ActorScroller.cpp
index ab39feed7b..23f5afc7c8 100644
--- a/stepmania/src/ActorScroller.cpp
+++ b/stepmania/src/ActorScroller.cpp
@@ -103,7 +103,7 @@ void ActorScroller::DrawPrimitives()
 	}
 	else
 	{
-		for( int i=0; i<m_SubActors.size(); i++ )
+		for( unsigned i=0; i<m_SubActors.size(); i++ )
 		{
 			float fItemOffset = i - m_fCurrentItem;
 
diff --git a/stepmania/src/ScreenSMOnlineLogin.cpp b/stepmania/src/ScreenSMOnlineLogin.cpp
index 766796f717..8ecd4a9f06 100644
--- a/stepmania/src/ScreenSMOnlineLogin.cpp
+++ b/stepmania/src/ScreenSMOnlineLogin.cpp
@@ -39,7 +39,7 @@ ScreenSMOnlineLogin::ScreenSMOnlineLogin( const CString& sName ) : ScreenWithMen
 
 	m_textUserName.LoadFromFont( THEME->GetPathF(m_sName,"text") );
 	m_textUserName.SetName( "UserName" );
-	m_textUserName.SetWrapWidthPixels( SCREEN_WIDTH );
+	m_textUserName.SetWrapWidthPixels( (int)SCREEN_WIDTH );
 	SET_XY_AND_ON_COMMAND( m_textUserName );
 	this->AddChild( &m_textUserName );
 
@@ -192,7 +192,7 @@ void ScreenSMOnlineLogin::UpdateTextInput()
 {
 	CString PasswordText;
 
-	for ( int i = 0; i < m_sPassword.length(); ++i )
+	for ( unsigned i = 0; i < m_sPassword.length(); ++i )
 		PasswordText+='*';
 
 	m_textPassword.SetText( PasswordText );  
diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 7b0090982d..a0fd3ff3df 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -245,7 +245,7 @@ void ScreenSelect::HandleScreenMessage( const ScreenMessage SM )
 
 			const int iSelectionIndex = GetSelectionIndex(GAMESTATE->m_MasterPlayerNumber);
 			if( m_aGameCommands[iSelectionIndex].m_sScreen != "" )
-				SCREENMAN->SetNewScreen( m_aGameCommands[iSelectionIndex ].m_sScreen );
+				SCREENMAN->SetNewScreen( m_aGameCommands[iSelectionIndex].m_sScreen );
 			else
 				SCREENMAN->SetNewScreen( NEXT_SCREEN(iSelectionIndex) );
 		}
diff --git a/stepmania/src/ScreenSelectMaster.cpp b/stepmania/src/ScreenSelectMaster.cpp
index 5fa129a475..84611030f5 100644
--- a/stepmania/src/ScreenSelectMaster.cpp
+++ b/stepmania/src/ScreenSelectMaster.cpp
@@ -475,8 +475,6 @@ bool ScreenSelectMaster::ChangeSelection( PlayerNumber pn, int iNewChoice )
 	if( GetPage(m_iChoice[pn]) != GetPage(iNewChoice) )
 		return ChangePage( iNewChoice );
 
-	bool bMoveAll = SHARED_PREVIEW_AND_CURSOR || GetCurrentPage()!=PAGE_1;
-
 	FOREACH_PlayerNumber( p )
 	{
 		const int iOldChoice = m_iChoice[p];
diff --git a/stepmania/src/XmlFile.cpp b/stepmania/src/XmlFile.cpp
index 43d12d797b..3f9d3a0d69 100644
--- a/stepmania/src/XmlFile.cpp
+++ b/stepmania/src/XmlFile.cpp
@@ -699,7 +699,6 @@ const XNode *XNode::GetChild( const char* name ) const
 	multimap<CString, XNode*>::const_iterator it = m_childs.find( name );
 	if( it != m_childs.end() )
 	{
-		XNode* p = it->second;
 		DEBUG_ASSERT( name == it->second->m_sName );
 		return it->second;
 	}
diff --git a/stepmania/src/XmlFile.h b/stepmania/src/XmlFile.h
index 6a2022cc6e..c5b701d667 100644
--- a/stepmania/src/XmlFile.h
+++ b/stepmania/src/XmlFile.h
@@ -31,30 +31,30 @@ typedef multimap<CString,XNode*> XNodes;
 #define FOREACH_Attr( pNode, Var ) \
 	XAttrs::iterator Var##Iter; \
 	XAttr *Var = NULL; \
-	for( Var##Iter = (pNode)->m_attrs.begin(); \
-		(Var##Iter != (pNode)->m_attrs.end() && (Var = Var##Iter->second) ),  Var##Iter != (pNode)->m_attrs.end(); \
-		++Var##Iter )
+	for( Var##Iter = (pNode)->m_attrs.begin(), Var = Var##Iter->second; \
+		Var##Iter != (pNode)->m_attrs.end(); \
+		++Var##Iter, Var = Var##Iter->second )
 
 #define FOREACH_CONST_Attr( pNode, Var ) \
 	XAttrs::const_iterator Var##Iter; \
 	const XAttr *Var = NULL; \
-	for( Var##Iter = (pNode)->m_attrs.begin(); \
-		(Var##Iter != (pNode)->m_attrs.end() && (Var = Var##Iter->second) ),  Var##Iter != (pNode)->m_attrs.end(); \
-		++Var##Iter )
+	for( Var##Iter = (pNode)->m_attrs.begin(), Var = Var##Iter->second; \
+		Var##Iter != (pNode)->m_attrs.end(); \
+		++Var##Iter, Var = Var##Iter->second )
 
 #define FOREACH_Child( pNode, Var ) \
 	XNodes::iterator Var##Iter; \
 	XNode *Var = NULL; \
-	for( Var##Iter = (pNode)->m_childs.begin(); \
-		(Var##Iter != (pNode)->m_childs.end() && (Var = Var##Iter->second) ),  Var##Iter != (pNode)->m_childs.end(); \
-		++Var##Iter )
+	for( Var##Iter = (pNode)->m_childs.begin(), Var = Var##Iter->second; \
+		Var##Iter != (pNode)->m_childs.end(); \
+		++Var##Iter, Var = Var##Iter->second )
 
 #define FOREACH_CONST_Child( pNode, Var ) \
 	XNodes::const_iterator Var##Iter; \
 	const XNode *Var = NULL; \
-	for( Var##Iter = (pNode)->m_childs.begin(); \
-		(Var##Iter != (pNode)->m_childs.end() && (Var = Var##Iter->second) ),  Var##Iter != (pNode)->m_childs.end(); \
-		++Var##Iter )
+	for( Var##Iter = (pNode)->m_childs.begin(), Var = Var##Iter->second; \
+		Var##Iter != (pNode)->m_childs.end(); \
+		++Var##Iter, Var = Var##Iter->second )
 
 
 // Entity Encode/Decode Support