diff --git a/src/Player.h b/src/Player.h
index 955f257e7d..04d75050d1 100644
--- a/src/Player.h
+++ b/src/Player.h
@@ -134,7 +134,7 @@ class Player: public ActorFrame
 
 protected:
 	void UpdateTapNotesMissedOlderThan( float fMissIfOlderThanThisBeat );
-	void UpdateJudgedRows();
+	void UpdateJudgedRows(float fDeltaTime);
 	void FlashGhostRow( int iRow );
 	void HandleTapRowScore( unsigned row );
 	void HandleHoldScore( const TapNote &tn );
diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index 2885c64607..cb47a5d8c9 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -778,9 +778,9 @@ void FindEvent(int& event_row, int& event_type,
 	const vector<TimingSegment*>& bpms, const vector<TimingSegment*>& warps,
 	const vector<TimingSegment*>& stops, const vector<TimingSegment*>& delays)
 {
-	if(start.is_warping && BeatToNoteRow(start.warp_destination) < event_row)
+	if(start.is_warping && BeatToNoteRowNotRounded(start.warp_destination) < event_row)
 	{
-		event_row= BeatToNoteRow(start.warp_destination);
+		event_row= BeatToNoteRowNotRounded(start.warp_destination);
 		event_type= FOUND_WARP_DESTINATION;
 	}
 	if(start.bpm < bpms.size() && bpms[start.bpm]->GetRow() < event_row)
@@ -793,9 +793,9 @@ void FindEvent(int& event_row, int& event_type,
 		event_row= delays[start.delay]->GetRow();
 		event_type= FOUND_DELAY;
 	}
-	if(find_marker && BeatToNoteRow(beat) < event_row)
+	if(find_marker && BeatToNoteRowNotRounded(beat) < event_row)
 	{
-		event_row= BeatToNoteRow(beat);
+		event_row= BeatToNoteRowNotRounded(beat);
 		event_type= FOUND_MARKER;
 	}
 	if(start.stop < stops.size() && stops[start.stop]->GetRow() < event_row)