diff --git a/stepmania/src/Actor.cpp b/stepmania/src/Actor.cpp
index 1bff1410d0..4bb242aefd 100644
--- a/stepmania/src/Actor.cpp
+++ b/stepmania/src/Actor.cpp
@@ -514,7 +514,7 @@ void GetFadeFlagsFromString( CString sFadeString,
 
 
 
-void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds, bool bOnToScreenOrOffOfScreen )
+void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds, bool bFadingOff )
 {
 	sFadeString.MakeLower();
 
@@ -528,8 +528,8 @@ void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds,
 
 	TweenType tt;
 	if( CONTAINS("linear") )			tt = TWEEN_LINEAR;
-	else if( CONTAINS("accelerate") )	tt = bOnToScreenOrOffOfScreen ? TWEEN_BIAS_END : TWEEN_BIAS_BEGIN;
-	else if( CONTAINS("bounce") )		tt = bOnToScreenOrOffOfScreen ? TWEEN_BOUNCE_END : TWEEN_BOUNCE_BEGIN;
+	else if( CONTAINS("accelerate") )	tt = bFadingOff ? TWEEN_BIAS_END : TWEEN_BIAS_BEGIN;
+	else if( CONTAINS("bounce") )		tt = bFadingOff ? TWEEN_BOUNCE_BEGIN : TWEEN_BOUNCE_END;
 	else if( CONTAINS("spring") )		tt = TWEEN_SPRING;
 	else								tt = TWEEN_LINEAR;
 
@@ -561,10 +561,10 @@ void Actor::Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds,
 
 
 	StopTweening();
-	m_current = bOnToScreenOrOffOfScreen ? original : mod;
+	m_current = bFadingOff ? original : mod;
 	BeginTweening( fSleepSeconds );
 	BeginTweening( fFadeSeconds, tt );
-	LatestTween() = bOnToScreenOrOffOfScreen ? mod : original;
+	LatestTween() = bFadingOff ? mod : original;
 }
 
 float Actor::TweenTime() const
diff --git a/stepmania/src/Actor.h b/stepmania/src/Actor.h
index 50afdcf5e9..6d7d1e974e 100644
--- a/stepmania/src/Actor.h
+++ b/stepmania/src/Actor.h
@@ -190,7 +190,7 @@ public:
 	//
 	// fade command
 	//
-	void Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds, bool bOnToScreenOrOffOfScreen );
+	void Fade( float fSleepSeconds, CString sFadeString, float fFadeSeconds, bool bFadingOff );
 	void FadeOn( float fSleepSeconds, CString sFadeString, float fFadeSeconds )	{ Fade(fSleepSeconds,sFadeString,fFadeSeconds,false); };
 	void FadeOff( float fSleepSeconds, CString sFadeString, float fFadeSeconds )	{ Fade(fSleepSeconds,sFadeString,fFadeSeconds,true); };
 
diff --git a/stepmania/src/SongManager.cpp b/stepmania/src/SongManager.cpp
index da44d9ccc4..4c17eed93c 100644
--- a/stepmania/src/SongManager.cpp
+++ b/stepmania/src/SongManager.cpp
@@ -495,9 +495,9 @@ void SongManager::SaveMachineScoresToDisk()
 			{
 				fprintf(fp,"%d\n",COURSE_SCORES_VERSION);
 
-				for( unsigned c=0; c<m_pCourses.size(); c++ )	// foreach song
+				for( unsigned i=0; i<m_pCourses.size(); i++ )	// foreach song
 				{
-					Course* pCourse = m_pCourses[c];
+					Course* pCourse = m_pCourses[i];
 					ASSERT(pCourse);
 
 					if( pCourse->m_bIsAutoGen )
@@ -505,11 +505,11 @@ void SongManager::SaveMachineScoresToDisk()
 					else
 						fprintf(fp, "%s\n", pCourse->m_sPath.c_str());
 					
-					for( int i=0; i<NUM_NOTES_TYPES; i++ )
+					for( int nt=0; nt<NUM_NOTES_TYPES; nt++ )
 						fprintf(fp, "%d %d %f\n", 
-							pCourse->m_MemCardScores[c][i].iNumTimesPlayed, 
-							pCourse->m_MemCardScores[c][i].iDancePoints, 
-							pCourse->m_MemCardScores[c][i].fSurviveTime);
+							pCourse->m_MemCardScores[c][nt].iNumTimesPlayed, 
+							pCourse->m_MemCardScores[c][nt].iDancePoints, 
+							pCourse->m_MemCardScores[c][nt].fSurviveTime);
 				}
 
 				fclose(fp);