diff --git a/stepmania/src/Difficulty.h b/stepmania/src/Difficulty.h
index aaf5906009..499c45fa13 100644
--- a/stepmania/src/Difficulty.h
+++ b/stepmania/src/Difficulty.h
@@ -24,6 +24,7 @@ Difficulty StringToDifficulty( const CString& sDC );
 
 
 typedef Difficulty CourseDifficulty;
+#define NUM_COURSE_DIFFICULTIES NUM_DIFFICULTIES
 #define FOREACH_CourseDifficulty FOREACH_Difficulty
 #define FOREACH_ShownCourseDifficulty( cd ) for( Difficulty cd=GetNextShownCourseDifficulty((CourseDifficulty)-1); cd!=DIFFICULTY_INVALID; cd=GetNextShownCourseDifficulty(cd) )
 
diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp
index 3eb48b43b6..8177ac50b3 100644
--- a/stepmania/src/ScreenEnding.cpp
+++ b/stepmania/src/ScreenEnding.cpp
@@ -40,7 +40,8 @@ CString GetStatsLineTitle( PlayerNumber pn, EndingStatsLine line )
 			CString sStepsType = GAMEMAN->StepsTypeToThemedString(st);
 			if( GAMESTATE->IsCourseMode() )
 			{
-				CourseDifficulty cd = (CourseDifficulty)line;
+				CourseDifficulty cd = (CourseDifficulty)(DIFFICULTY_EASY+line-PERCENT_COMPLETE_EASY);
+				ASSERT( cd >= 0 && cd < NUM_COURSE_DIFFICULTIES );
 				if( !GAMESTATE->IsCourseDifficultyShown(cd) )
 					return "";
 				CString sDifficulty = CourseDifficultyToThemedString(cd);
@@ -48,7 +49,8 @@ CString GetStatsLineTitle( PlayerNumber pn, EndingStatsLine line )
 			}
 			else
 			{
-				Difficulty dc = (Difficulty)line;
+				Difficulty dc = (Difficulty)(DIFFICULTY_EASY+line-PERCENT_COMPLETE_EASY);
+				ASSERT( dc >= 0 && dc < NUM_DIFFICULTIES );
 				CString sDifficulty = DifficultyToThemedString(dc);
 				return ssprintf( "%s %% Complete", sStepsType.c_str() );
 			}
@@ -76,7 +78,8 @@ CString GetStatsLineValue( PlayerNumber pn, EndingStatsLine line )
 			CString sStepsType = GAMEMAN->StepsTypeToThemedString(st);
 			if( GAMESTATE->IsCourseMode() )
 			{
-				CourseDifficulty cd = (CourseDifficulty)line;
+				CourseDifficulty cd = (CourseDifficulty)(DIFFICULTY_EASY+line-PERCENT_COMPLETE_EASY);
+				ASSERT( cd >= 0 && cd < NUM_COURSE_DIFFICULTIES );
 				if( !GAMESTATE->IsCourseDifficultyShown(cd) )
 					return "";
 				CString sDifficulty = CourseDifficultyToThemedString(cd);
@@ -84,7 +87,8 @@ CString GetStatsLineValue( PlayerNumber pn, EndingStatsLine line )
 			}
 			else
 			{
-				Difficulty dc = (Difficulty)line;
+				Difficulty dc = (Difficulty)(DIFFICULTY_EASY+line-PERCENT_COMPLETE_EASY);
+				ASSERT( dc >= 0 && dc < NUM_DIFFICULTIES );
 				CString sDifficulty = DifficultyToThemedString(dc);
 				return ssprintf( "%06.3f%%", pProfile->GetSongsPercentComplete(st,dc)*100 );
 			}
@@ -98,8 +102,8 @@ ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, fa
 {
 	if( PREFSMAN->m_bScreenTestMode )
 	{
-		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_1, false);
-		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_2, false);
+		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_1);
+		PROFILEMAN->LoadFirstAvailableProfile(PLAYER_2);
 
 		GAMESTATE->m_PlayMode = PLAY_MODE_REGULAR;
 		GAMESTATE->m_pCurStyle = GAMEMAN->GameAndStringToStyle( GAMEMAN->GetDefaultGame(), "versus" );