diff --git a/stepmania/src/NoteData.cpp b/stepmania/src/NoteData.cpp
index 482abc9ea0..d0d4f5f73d 100644
--- a/stepmania/src/NoteData.cpp
+++ b/stepmania/src/NoteData.cpp
@@ -37,7 +37,7 @@ NoteData::~NoteData()
 {
 }
 
-int NoteData::GetNumTracks()
+int NoteData::GetNumTracks() const
 {
 	return m_iNumTracks;
 }
diff --git a/stepmania/src/NoteData.h b/stepmania/src/NoteData.h
index 7079e939ed..ea624faf51 100644
--- a/stepmania/src/NoteData.h
+++ b/stepmania/src/NoteData.h
@@ -42,7 +42,7 @@ public:
 	~NoteData();
 	void Init();
 
-	int GetNumTracks();
+	int GetNumTracks() const;
 	void SetNumTracks( int iNewNumTracks );
 
 	/* Return the note at the given track and row.  Row may be out of
diff --git a/stepmania/src/NoteDataWithScoring.cpp b/stepmania/src/NoteDataWithScoring.cpp
index 1beff71b5a..a0734b621a 100644
--- a/stepmania/src/NoteDataWithScoring.cpp
+++ b/stepmania/src/NoteDataWithScoring.cpp
@@ -30,7 +30,7 @@ void NoteDataWithScoring::Init()
 	m_fHoldNoteLife.clear();
 }
 
-int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat, float fEndBeat )
+int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat, float fEndBeat ) const
 { 
 	int iNumSuccessfulTapNotes = 0;
 
@@ -52,7 +52,7 @@ int NoteDataWithScoring::GetNumTapNotesWithScore( TapNoteScore tns, const float
 	return iNumSuccessfulTapNotes;
 }
 
-int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat, float fEndBeat )
+int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat, float fEndBeat ) const
 {
 	int iNumSuccessfulDoubles = 0;
 
@@ -81,7 +81,7 @@ int NoteDataWithScoring::GetNumDoublesWithScore( TapNoteScore tns, const float f
 	return iNumSuccessfulDoubles;
 }
 
-int NoteDataWithScoring::GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat, float fEndBeat )
+int NoteDataWithScoring::GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat, float fEndBeat ) const
 {
 	int iNumSuccessfulHolds = 0;
 
@@ -97,7 +97,7 @@ int NoteDataWithScoring::GetNumHoldNotesWithScore( HoldNoteScore hns, const floa
 	return iNumSuccessfulHolds;
 }
 
-bool NoteDataWithScoring::IsRowComplete( int index )
+bool NoteDataWithScoring::IsRowComplete( int index ) const
 {
 	for( int t=0; t<GetNumTracks(); t++ )
 		if( GetTapNote(t, index) != TAP_EMPTY && GetTapNoteScore(t, index) < TNS_GREAT )
@@ -105,7 +105,7 @@ bool NoteDataWithScoring::IsRowComplete( int index )
 	return true;
 }
 
-float NoteDataWithScoring::GetActualRadarValue( RadarCategory rv, float fSongSeconds )
+float NoteDataWithScoring::GetActualRadarValue( RadarCategory rv, float fSongSeconds ) const
 {
 	switch( rv )
 	{
@@ -118,7 +118,7 @@ float NoteDataWithScoring::GetActualRadarValue( RadarCategory rv, float fSongSec
 	}
 }
 
-float NoteDataWithScoring::GetActualStreamRadarValue( float fSongSeconds )
+float NoteDataWithScoring::GetActualStreamRadarValue( float fSongSeconds ) const
 {
 	// density of steps
 	int iNumSuccessfulNotes = 
@@ -131,7 +131,7 @@ float NoteDataWithScoring::GetActualStreamRadarValue( float fSongSeconds )
 	return min( fReturn, 1.0f );
 }
 
-float NoteDataWithScoring::GetActualVoltageRadarValue( float fSongSeconds )
+float NoteDataWithScoring::GetActualVoltageRadarValue( float fSongSeconds ) const
 {
 	float fAvgBPS = GetLastBeat() / fSongSeconds;
 
@@ -156,7 +156,7 @@ float NoteDataWithScoring::GetActualVoltageRadarValue( float fSongSeconds )
 	return min( fReturn, 1.0f );
 }
 
-float NoteDataWithScoring::GetActualAirRadarValue( float fSongSeconds )
+float NoteDataWithScoring::GetActualAirRadarValue( float fSongSeconds ) const
 {
 	// number of doubles
 	int iNumDoubles = 
@@ -167,7 +167,7 @@ float NoteDataWithScoring::GetActualAirRadarValue( float fSongSeconds )
 	return min( fReturn, 1.0f );
 }
 
-float NoteDataWithScoring::GetActualChaosRadarValue( float fSongSeconds )
+float NoteDataWithScoring::GetActualChaosRadarValue( float fSongSeconds ) const
 {
 	// count number of triplets
 	int iNumChaosNotesCompleted = 0;
@@ -181,7 +181,7 @@ float NoteDataWithScoring::GetActualChaosRadarValue( float fSongSeconds )
 	return min( fReturn, 1.0f );
 }
 
-float NoteDataWithScoring::GetActualFreezeRadarValue( float fSongSeconds )
+float NoteDataWithScoring::GetActualFreezeRadarValue( float fSongSeconds ) const
 {
 	// number of hold steps
 	float fReturn = GetNumHoldNotesWithScore(HNS_OK) / fSongSeconds;
diff --git a/stepmania/src/NoteDataWithScoring.h b/stepmania/src/NoteDataWithScoring.h
index 2bd8a546ef..72770b6430 100644
--- a/stepmania/src/NoteDataWithScoring.h
+++ b/stepmania/src/NoteDataWithScoring.h
@@ -31,9 +31,9 @@ public:
 	void Init();
 
 	// statistics
-	int GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 );
-	int GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 );
-	int GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat = 0, const float fEndBeat = -1 );
+	int GetNumTapNotesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
+	int GetNumDoublesWithScore( TapNoteScore tns, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
+	int GetNumHoldNotesWithScore( HoldNoteScore hns, const float fStartBeat = 0, const float fEndBeat = -1 ) const;
 
 	TapNoteScore GetTapNoteScore(unsigned track, unsigned row) const;
 	void SetTapNoteScore(unsigned track, unsigned row, TapNoteScore tns);
@@ -42,14 +42,14 @@ public:
 	float GetHoldNoteLife(unsigned h) const;
 	void SetHoldNoteLife(unsigned h, float f);
 
-	bool IsRowComplete( int index );
+	bool IsRowComplete( int index ) const;
 
-	float GetActualRadarValue( RadarCategory rv, float fSongSeconds );
-	float GetActualStreamRadarValue( float fSongSeconds );
-	float GetActualVoltageRadarValue( float fSongSeconds );
-	float GetActualAirRadarValue( float fSongSeconds );
-	float GetActualFreezeRadarValue( float fSongSeconds );
-	float GetActualChaosRadarValue( float fSongSeconds );
+	float GetActualRadarValue( RadarCategory rv, float fSongSeconds ) const;
+	float GetActualStreamRadarValue( float fSongSeconds ) const;
+	float GetActualVoltageRadarValue( float fSongSeconds ) const;
+	float GetActualAirRadarValue( float fSongSeconds ) const;
+	float GetActualFreezeRadarValue( float fSongSeconds ) const;
+	float GetActualChaosRadarValue( float fSongSeconds ) const;
 };
 
 #endif