diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index d36e0f5400..e337c283a7 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -544,6 +544,7 @@ void NoteData::Turn( PlayerOptions::TurnType tt )
 			break;
 		case NOTES_TYPE_PUMP_SINGLE:
 		case NOTES_TYPE_PUMP_DOUBLE:
+		case NOTES_TYPE_PUMP_COUPLE:
 			iTakeFromTrack[0] = 1;
 			iTakeFromTrack[1] = 3;
 			iTakeFromTrack[2] = 2;
@@ -773,7 +774,7 @@ float NoteData::GetFreezeRadarValue( float fSongSeconds )
 }
 
 
-void NoteData::LoadTransformed( NoteData* pOriginal, int iNewNumTracks, int iNewToOriginalTrack[] )
+void NoteData::LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, const int iNewToOriginalTrack[] )
 {
 	// init
 	Init();
@@ -791,7 +792,7 @@ void NoteData::LoadTransformed( NoteData* pOriginal, int iNewNumTracks, int iNew
 
 		for( i=0; i<pOriginal->m_iNumHoldNotes; i++ )
 		{
-			HoldNote &hn = pOriginal->m_HoldNotes[i];
+			HoldNote hn = pOriginal->m_HoldNotes[i];
 			if( hn.m_iTrack == iOriginalTrack )
 			{
 				hn.m_iTrack = t;
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index a7b6e86ef4..51453f35f9 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -88,7 +88,7 @@ public:
 	float GetChaosRadarValue( float fSongSeconds );
 
 	// Transformations
-	void LoadTransformed( NoteData* pOriginal, int iNewNumTracks, int iNewToOriginalTrack[] );
+	void LoadTransformed( const NoteData* pOriginal, int iNewNumTracks, const int iNewToOriginalTrack[] );
 
 	void CropToLeftSide();
 	void CropToRightSide();
diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp
index 24cb424fdd..bead96c335 100644
--- a/stepmania/src/NoteField.cpp
+++ b/stepmania/src/NoteField.cpp
@@ -55,7 +55,7 @@ void NoteField::Load( NoteData* pNoteData, PlayerNumber pn, int iPixelsToDrawBeh
 	for( int i=0; i<MAX_HOLD_NOTES; i++ )
 		m_bIsHoldingHoldNote[i] = false;
 
-	StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
+	const StyleDef* pStyleDef = GAMESTATE->GetCurrentStyleDef();
 
 	this->CopyAll( pNoteData );
 
diff --git a/stepmania/src/StyleDef.cpp b/stepmania/src/StyleDef.cpp
index a9b1ab0d7e..383fe623d5 100644
--- a/stepmania/src/StyleDef.cpp
+++ b/stepmania/src/StyleDef.cpp
@@ -18,7 +18,7 @@
 #include "GameState.h"
 
 
-void StyleDef::GetTransformedNoteDataForStyle( PlayerNumber p, NoteData* pOriginal, NoteData* pNoteDataOut )
+void StyleDef::GetTransformedNoteDataForStyle( PlayerNumber p, const NoteData* pOriginal, NoteData* pNoteDataOut )
 {
 	int iNewToOriginalTrack[MAX_COLS_PER_PLAYER];
 	for( int col=0; col<m_iColsPerPlayer; col++ )
@@ -33,14 +33,14 @@ void StyleDef::GetTransformedNoteDataForStyle( PlayerNumber p, NoteData* pOrigin
 }
 
 
-GameInput StyleDef::StyleInputToGameInput( const StyleInput StyleI )
+GameInput StyleDef::StyleInputToGameInput( const StyleInput StyleI ) const
 {
 	GameController c = m_ColumnInfo[StyleI.player][StyleI.col].controller;
 	GameButton b = m_ColumnInfo[StyleI.player][StyleI.col].button;
 	return GameInput( c, b );
 };
 
-StyleInput StyleDef::GameInputToStyleInput( const GameInput &GameI )
+StyleInput StyleDef::GameInputToStyleInput( const GameInput &GameI ) const
 {
 	StyleInput SI;
 
diff --git a/stepmania/src/StyleDef.h b/stepmania/src/StyleDef.h
index f04f07d215..89eae2f2eb 100644
--- a/stepmania/src/StyleDef.h
+++ b/stepmania/src/StyleDef.h
@@ -60,9 +60,9 @@ public:
 	ColumnInfo	m_ColumnInfo[NUM_PLAYERS][MAX_COLS_PER_PLAYER];	// maps each players' column to a track in the NoteData
 	int			m_iColumnDrawOrder[MAX_COLS_PER_PLAYER];
 
-	GameInput StyleInputToGameInput( const StyleInput StyleI );
-	StyleInput GameInputToStyleInput( const GameInput &GameI );
+	GameInput StyleInputToGameInput( const StyleInput StyleI ) const;
+	StyleInput GameInputToStyleInput( const GameInput &GameI ) const;
 
-	void GetTransformedNoteDataForStyle( PlayerNumber p, NoteData* pOriginal, NoteData* pNoteDataOut );
+	void GetTransformedNoteDataForStyle( PlayerNumber p, const NoteData* pOriginal, NoteData* pNoteDataOut );
 };