diff --git a/stepmania/src/ScreenNetSelectMusic.cpp b/stepmania/src/ScreenNetSelectMusic.cpp
index 2fdd4c6f7e..c27bd57dfa 100644
--- a/stepmania/src/ScreenNetSelectMusic.cpp
+++ b/stepmania/src/ScreenNetSelectMusic.cpp
@@ -57,7 +57,7 @@ const ScreenMessage SM_ChangeSong	= ScreenMessage(SM_User+5);
 
 const CString AllGroups			= "[ALL MUSIC]";
 
-ScreenNetSelectMusic::ScreenNetSelectMusic( CString sName ) : ScreenWithMenuElements( sName )
+ScreenNetSelectMusic::ScreenNetSelectMusic( const CString& sName ) : ScreenWithMenuElements( sName )
 {
 	/* Finish any previous stage.  It's OK to call this when we havn't played a stage yet. */
 	GAMESTATE->FinishStage();
diff --git a/stepmania/src/ScreenNetSelectMusic.h b/stepmania/src/ScreenNetSelectMusic.h
index ea60ac274c..336192c479 100644
--- a/stepmania/src/ScreenNetSelectMusic.h
+++ b/stepmania/src/ScreenNetSelectMusic.h
@@ -16,7 +16,7 @@
 class ScreenNetSelectMusic : public ScreenWithMenuElements
 {
 public:
-	ScreenNetSelectMusic( CString sName );
+	ScreenNetSelectMusic( const CString& sName );
 	virtual void DrawPrimitives();
 
 	virtual void Update( float fDeltaTime );
@@ -30,6 +30,7 @@ public:
 
 	void StartSelectedSong();
 
+private:
 	int	m_iSongNum;
 	int	m_iShowSongs;	//The number of songs to display to each side
 	int	m_iGroupNum;
@@ -57,6 +58,7 @@ protected:
 
 	void TweenOffScreen();
 
+private:
 	//Chatting
 	BitmapText		m_textChatInput;
 	BitmapText		m_textChatOutput;