diff --git a/stepmania/src/ActiveItemList.cpp b/stepmania/src/ActiveItemList.cpp
index 81d38221bc..8261863e43 100644
--- a/stepmania/src/ActiveItemList.cpp
+++ b/stepmania/src/ActiveItemList.cpp
@@ -25,20 +25,23 @@
 
 ActiveItemList::ActiveItemList()
 {
-	for( int i=0; i<MAX_ACTIVE_ITEMS_LINES; i++ )
-	{
-		m_text[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
-		m_text[i].SetZoom( TEXT_ZOOM );
-//		m_text[i].SetText( "WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW" );
-		this->AddChild( &m_text[i] );
-	}
 }
 
 void ActiveItemList::Init( PlayerNumber pn )
 {
 	m_PlayerNumber = pn;
 
-	for( int i=0; i<MAX_ACTIVE_ITEMS_LINES; i++ )
+	int i;
+
+	for( i=0; i<MAX_ACTIVE_ITEMS_LINES; i++ )
+	{
+		m_text[i].LoadFromFont( THEME->GetPathTo("Fonts","Common normal") );
+		m_text[i].SetZoom( TEXT_ZOOM );
+//		m_text[i].SetText( "WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW" );
+		this->AddChild( &m_text[i] );
+	}
+
+	for( i=0; i<MAX_ACTIVE_ITEMS_LINES; i++ )
 	{
 		m_text[i].SetHorizAlign( (Actor::HorizAlign)TEXT_HORIZ_ALIGN(pn) );
 		bool bReverse = GAMESTATE->m_PlayerOptions[pn].m_fReverseScroll == 1;
diff --git a/stepmania/src/Inventory.cpp b/stepmania/src/Inventory.cpp
index badf5c2921..b2c732eb5d 100644
--- a/stepmania/src/Inventory.cpp
+++ b/stepmania/src/Inventory.cpp
@@ -50,11 +50,12 @@ void ReloadItems()
 
 Inventory::Inventory()
 {
-	ReloadItems();
 }
 
 void Inventory::Load( PlayerNumber pn )
 {
+	ReloadItems();
+
 	m_PlayerNumber = pn;
 	m_iLastSeenCombo = 0;
 
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index b32b77452d..750008bbf4 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -229,9 +229,12 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 	
 		m_TimingAssist.Load((PlayerNumber)p, &m_Player[p]);
 
-		m_ActiveItemList[p].Init( (PlayerNumber)p );
-		/* Position it in LoadNextSong. */
-		this->AddChild( &m_ActiveItemList[p] );
+		if( GAMESTATE->m_PlayMode == PLAY_MODE_BATTLE )
+		{
+			m_ActiveItemList[p].Init( (PlayerNumber)p );
+			/* Position it in LoadNextSong. */
+			this->AddChild( &m_ActiveItemList[p] );
+		}
 
 		m_sprOniGameOver[p].Load( THEME->GetPathTo("Graphics","ScreenGameplay oni gameover") );
 		m_sprOniGameOver[p].SetX( fPlayerX );
@@ -411,11 +414,17 @@ ScreenGameplay::ScreenGameplay( bool bDemonstration )
 
 	for( p=0; p<NUM_PLAYERS; p++ )
 	{
-		m_Inventory[p].Load( (PlayerNumber)p );
-		this->AddChild( &m_Inventory[p] );
+		if( GAMESTATE->m_PlayMode==PLAY_MODE_BATTLE )
+		{
+			m_Inventory[p].Load( (PlayerNumber)p );
+			this->AddChild( &m_Inventory[p] );
+		}
 
-		m_RaveHelper[p].Load( (PlayerNumber)p );
-		this->AddChild( &m_RaveHelper[p] );
+		if( GAMESTATE->m_PlayMode==PLAY_MODE_RAVE )
+		{
+			m_RaveHelper[p].Load( (PlayerNumber)p );
+			this->AddChild( &m_RaveHelper[p] );
+		}
 	}
 
 	
diff --git a/stepmania/src/ScreenSelectCharacter.cpp b/stepmania/src/ScreenSelectCharacter.cpp
index 37e4d8117e..4db477b19f 100644
--- a/stepmania/src/ScreenSelectCharacter.cpp
+++ b/stepmania/src/ScreenSelectCharacter.cpp
@@ -59,7 +59,7 @@ ScreenSelectCharacter::ScreenSelectCharacter()
 	{
 		m_iSelectedCharacter[p] = 0;
 		m_iSelectedLevelIndex[p] = 0;
-		if( GAMESTATE->IsPlayerEnabled(p) )
+		if( GAMESTATE->IsHumanPlayer(p) )
 			m_SelectionRow[p] = CHOOSING_HUMAN_CHARACTER;
 	}
 
@@ -342,7 +342,8 @@ void ScreenSelectCharacter::MenuStart( PlayerNumber pn )
 
 	bool bAllAreFinished = true;
 	for( int p=0; p<NUM_PLAYERS; p++ )
-		bAllAreFinished &= (m_SelectionRow[p] == FINISHED_CHOOSING);
+		if( GAMESTATE->IsHumanPlayer(p) )
+			bAllAreFinished &= (m_SelectionRow[p] == FINISHED_CHOOSING);
 
 	if( bAllAreFinished )
 	{