diff --git a/stepmania/src/ScreenStage.cpp b/stepmania/src/ScreenStage.cpp
index bb6fa6d4e5..ea1976c2f9 100644
--- a/stepmania/src/ScreenStage.cpp
+++ b/stepmania/src/ScreenStage.cpp
@@ -214,7 +214,8 @@ ScreenStage::ScreenStage()
 		m_quadMask.SetDiffuse( D3DXCOLOR(0,0,0,0) );
 		m_quadMask.StretchTo( CRect(SCREEN_LEFT, roundf(fStageOffScreenY-fStageHeight/2), 
 							        SCREEN_RIGHT, roundf(fStageOffScreenY+fStageHeight/2)) );
-		m_quadMask.SetZ( -1 );		// important: fill Z buffer with values that will cause subsequent draws to fail the Z test
+		/* Put the quad mask on top, so draws to the Stage will be "under" it. */
+		m_quadMask.SetZ( -1 );
 
 		m_frameStage.SetXY( CENTER_X, fStageOffScreenY );
 		m_frameStage.BeginTweening(0.8f, Actor::TWEEN_BIAS_BEGIN );
@@ -227,7 +228,7 @@ ScreenStage::ScreenStage()
 	//
 	if( g_StageType == STAGE_TYPE_PUMP )
 	{
-		Song* pSong = GAMESTATE->m_pCurSong;
+		const Song* pSong = GAMESTATE->m_pCurSong;
 		m_sprSongBackground.Load( (pSong && pSong->HasBackground()) ? pSong->GetBackgroundPath() : THEME->GetPathTo("Graphics","fallback background") );
 		m_sprSongBackground.StretchTo( CRect(SCREEN_LEFT,SCREEN_TOP,SCREEN_RIGHT,SCREEN_BOTTOM) );
 
diff --git a/stepmania/src/song.h b/stepmania/src/song.h
index 810f5927e4..7fb89fccee 100644
--- a/stepmania/src/song.h
+++ b/stepmania/src/song.h
@@ -113,19 +113,19 @@ public:
 	CString	m_sCDTitleFile;
 	CString	m_sMovieBackgroundFile;
 
-	CString GetMusicPath()			{return m_sMusicFile.Find('.')==0 ? m_sMusicFile : m_sSongDir+m_sMusicFile; };
-	CString GetBannerPath()			{return m_sSongDir+m_sBannerFile; };
-	CString GetBackgroundPath()		{return m_sSongDir+m_sBackgroundFile; };
-	CString GetCDTitlePath()		{return m_sCDTitleFile.Find('.')==0 ? m_sCDTitleFile : m_sSongDir+m_sCDTitleFile; };
-	CString GetMovieBackgroundPath(){return m_sSongDir+m_sMovieBackgroundFile; };
+	CString GetMusicPath() const	{return m_sMusicFile.Find('.')==0 ? m_sMusicFile : m_sSongDir+m_sMusicFile; };
+	CString GetBannerPath() const	{return m_sSongDir+m_sBannerFile; };
+	CString GetBackgroundPath() const {return m_sSongDir+m_sBackgroundFile; };
+	CString GetCDTitlePath() const	{return m_sCDTitleFile.Find('.')==0 ? m_sCDTitleFile : m_sSongDir+m_sCDTitleFile; };
+	CString GetMovieBackgroundPath() const {return m_sSongDir+m_sMovieBackgroundFile; };
 
 
-	bool HasMusic()				{return m_sMusicFile != ""			&&	IsAFile(GetMusicPath()); };
-	bool HasBanner()			{return m_sBannerFile != ""			&&  IsAFile(GetBannerPath()); };
-	bool HasBackground()		{return m_sBackgroundFile != ""		&&  IsAFile(GetBackgroundPath()); };
-	bool HasCDTitle()			{return m_sCDTitleFile != ""		&&  IsAFile(GetCDTitlePath()); };
-	bool HasMovieBackground()	{return m_sMovieBackgroundFile != ""&&  IsAFile(GetMovieBackgroundPath()); };
-	bool HasBGChanges()			{return m_BackgroundChanges.GetSize() > 0; };
+	bool HasMusic() const 		{return m_sMusicFile != ""			&&	IsAFile(GetMusicPath()); };
+	bool HasBanner() const 		{return m_sBannerFile != ""			&&  IsAFile(GetBannerPath()); };
+	bool HasBackground() const 	{return m_sBackgroundFile != ""		&&  IsAFile(GetBackgroundPath()); };
+	bool HasCDTitle() const 	{return m_sCDTitleFile != ""		&&  IsAFile(GetCDTitlePath()); };
+	bool HasMovieBackground() const {return m_sMovieBackgroundFile != ""&&  IsAFile(GetMovieBackgroundPath()); };
+	bool HasBGChanges() const 	{return m_BackgroundChanges.GetSize() > 0; };
 
 	CArray<BPMSegment, BPMSegment&> m_BPMSegments;	// this must be sorted before gameplay
 	CArray<StopSegment, StopSegment&> m_StopSegments;	// this must be sorted before gameplay