diff --git a/stepmania/src/Combo.cpp b/stepmania/src/Combo.cpp
index 9a071785f4..eb0ab448c7 100644
--- a/stepmania/src/Combo.cpp
+++ b/stepmania/src/Combo.cpp
@@ -11,8 +11,6 @@ Combo::Combo()
 	m_iLastSeenCombo = -1;
 	m_pPlayerState = NULL;
 	m_pPlayerStageStats = NULL;
-
-	this->SubscribeToMessage( Message_BeatCrossed );
 }
 
 void Combo::Load( const RString &sPath, const PlayerState *pPlayerState, const PlayerStageStats *pPlayerStageStats )
@@ -22,7 +20,6 @@ void Combo::Load( const RString &sPath, const PlayerState *pPlayerState, const P
 	m_pPlayerState = pPlayerState;
 	m_pPlayerStageStats = pPlayerStageStats;
 
-	LuaThreadVariable var( "Player", LuaReference::Create(m_pPlayerState->m_PlayerNumber) );
 	m_sprComboLabel.Load( sPath );
 	this->AddChild( m_sprComboLabel );
 }
diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp
index 86fbe11ea7..ed764a870a 100644
--- a/stepmania/src/Player.cpp
+++ b/stepmania/src/Player.cpp
@@ -327,15 +327,14 @@ void Player::Init(
 	m_soundAttackEnding.SetProperty( "Pan", fBalance );
 
 	{
+		LuaThreadVariable var( "Player", LuaReference::Create(m_pPlayerState->m_PlayerNumber) );
+		LuaThreadVariable var2( "MultiPlayer", LuaReference::Create(m_pPlayerState->m_mp) );
+
 		m_Combo.SetName( "Combo" );
 		m_Combo.Load( THEME->GetPathG(sType,"combo"), m_pPlayerState, m_pPlayerStageStats );
 		ActorUtil::LoadAllCommandsAndOnCommand( m_Combo, sType );
 		this->AddChild( &m_Combo );
-	}
 
-	{
-		LuaThreadVariable var( "Player", LuaReference::Create(m_pPlayerState->m_PlayerNumber) );
-		LuaThreadVariable var2( "MultiPlayer", LuaReference::Create(m_pPlayerState->m_mp) );
 		m_pJudgment.Load( THEME->GetPathG(sType,"judgment") );
 		m_pJudgment->SetName( "Judgment" );
 		ActorUtil::LoadAllCommandsAndOnCommand( m_pJudgment, sType );