diff --git a/stepmania/src/Course.cpp b/stepmania/src/Course.cpp
index 314166603d..5946c2012a 100644
--- a/stepmania/src/Course.cpp
+++ b/stepmania/src/Course.cpp
@@ -135,7 +135,7 @@ void Course::LoadFromCRSFile( CString sPath )
 			m_iLives = atoi( sParams[1] );
 
 		else if( 0 == stricmp(sValueName, "GAINSECONDS") )
-			fGainSeconds = atof( sParams[1] );
+			fGainSeconds = (float)atof( sParams[1] );
 
 		else if( 0 == stricmp(sValueName, "METER") )
 		{
diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp
index b12b38f80b..db46d68666 100644
--- a/stepmania/src/ScreenGameplay.cpp
+++ b/stepmania/src/ScreenGameplay.cpp
@@ -1752,28 +1752,25 @@ void ScreenGameplay::SendCrossedMessages()
 	{
 		float fOffsetFromCurrentSeconds = MESSAGE_SPACING_SECONDS * i;
 
-		bool bCrossedABeat = false;
+		float fPositionSeconds = GAMESTATE->m_fMusicSeconds + fOffsetFromCurrentSeconds;	// trigger the light a tiny bit early
+		float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
+
+		int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
+		iRowNow = max( 0, iRowNow );
+		static int iRowLastCrossedAll[NUM_MESSAGES_TO_SEND] = { 0, 0, 0, 0 };
+		int &iRowLastCrossed = iRowLastCrossedAll[i];
+
+		FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( m_Player[pn].m_NoteData, r, iRowLastCrossed+1, iRowNow+1 )
 		{
-			float fPositionSeconds = GAMESTATE->m_fMusicSeconds + fOffsetFromCurrentSeconds;	// trigger the light a tiny bit early
-			float fSongBeat = GAMESTATE->m_pCurSong->GetBeatFromElapsedTime( fPositionSeconds );
-
-			int iRowNow = BeatToNoteRowNotRounded( fSongBeat );
-			iRowNow = max( 0, iRowNow );
-			static int iRowLastCrossedAll[NUM_MESSAGES_TO_SEND] = { 0, 0, 0, 0 };
-			int &iRowLastCrossed = iRowLastCrossedAll[i];
-
-			FOREACH_NONEMPTY_ROW_ALL_TRACKS_RANGE( m_Player[pn].m_NoteData, r, iRowLastCrossed+1, iRowNow+1 )
+			if( m_CabinetLightsNoteData.IsThereATapOrHoldHeadAtRow(r) )
 			{
-				if( m_CabinetLightsNoteData.IsThereATapOrHoldHeadAtRow(r) )
-				{
-					LOG->Trace( "r = %d", r );
-					MESSAGEMAN->Broadcast( (Message)(MESSAGE_NOTE_CROSSED + i) );
-					break;
-				}
+				LOG->Trace( "r = %d", r );
+				MESSAGEMAN->Broadcast( (Message)(MESSAGE_NOTE_CROSSED + i) );
+				break;
 			}
-
-			iRowLastCrossed = iRowNow;
 		}
+
+		iRowLastCrossed = iRowNow;
 	}
 }