diff --git a/src/GameState.cpp b/src/GameState.cpp
index febaf7b235..be32f36790 100644
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -1915,6 +1915,12 @@ bool GameState::CurrentOptionsDisqualifyPlayer( PlayerNumber pn )
 		return false;
 
 	const PlayerOptions &po = m_pPlayerState[pn]->m_PlayerOptions.GetPreferred();
+	const SongOptions &so = m_SongOptions.GetPreferred();
+
+	// Playing a song/course at a slower music rate should disqualify score. -x0rbl
+	if (so.m_fMusicRate < 1.0) {
+		return true;
+	}
 
 	// Check the stored player options for disqualify.  Don't disqualify because
 	// of mods that were forced.
diff --git a/src/Steps.cpp b/src/Steps.cpp
index 8b6643dfc9..38129a57c7 100644
--- a/src/Steps.cpp
+++ b/src/Steps.cpp
@@ -595,7 +595,9 @@ bool Steps::HasSignificantTimingChanges() const
 	if( timing->HasBpmChanges() )
 	{
 		// check to see if these changes are significant.
-		if( (GetMaxBPM() - GetMinBPM()) > 3.000f )
+		DisplayBpms bpms;
+		m_pSong->GetDisplayBpms(bpms);
+		if (bpms.GetMax() - bpms.GetMin() > 3.000f)
 			return true;
 	}