diff --git a/stepmania/src/NoteDataUtil.cpp b/stepmania/src/NoteDataUtil.cpp
index 67da85a845..a5f74d8254 100644
--- a/stepmania/src/NoteDataUtil.cpp
+++ b/stepmania/src/NoteDataUtil.cpp
@@ -1290,7 +1290,7 @@ void NoteDataUtil::SnapToNearestNoteType( NoteData &inout, NoteType nt1, NoteTyp
 		case NOTE_TYPE_32ND:	fSnapInterval2 = 1/8.0f;	break;
 		case NOTE_TYPE_48TH:	fSnapInterval2 = 1/12.0f;	break;
 		case NOTE_TYPE_64TH:	fSnapInterval2 = 1/16.0f;	break;
-		case -1:				fSnapInterval2 = 10000;		break;	// nothing will ever snap to this.  That's what we want!
+		case NOTE_TYPE_INVALID:	fSnapInterval2 = 10000;	break;	// nothing will ever snap to this.  That's what we want!
 		default:	ASSERT( false );						return;
 	}
 
diff --git a/stepmania/src/NoteDataUtil.h b/stepmania/src/NoteDataUtil.h
index b2546d21b2..1cfcd1711c 100644
--- a/stepmania/src/NoteDataUtil.h
+++ b/stepmania/src/NoteDataUtil.h
@@ -78,7 +78,10 @@ namespace NoteDataUtil
 
 	void SnapToNearestNoteType( NoteData &inout, NoteType nt1, NoteType nt2, float fBeginBeat, float fEndBeat );
 
-	inline void SnapToNearestNoteType( NoteData &inout, NoteType nt, float fBeginBeat, float fEndBeat ) { SnapToNearestNoteType( inout, nt, (NoteType)-1, fBeginBeat, fEndBeat ); }
+	inline void SnapToNearestNoteType( NoteData &inout, NoteType nt, float fBeginBeat, float fEndBeat )
+	{
+		SnapToNearestNoteType( inout, nt, NOTE_TYPE_INVALID, fBeginBeat, fEndBeat );
+	}
 
 	void FixImpossibleRows( NoteData &inout, StepsType st );
 
diff --git a/stepmania/src/NotesLoaderBMS.cpp b/stepmania/src/NotesLoaderBMS.cpp
index 1203915879..ca21e33b1e 100644
--- a/stepmania/src/NotesLoaderBMS.cpp
+++ b/stepmania/src/NotesLoaderBMS.cpp
@@ -310,8 +310,13 @@ bool BMSLoader::LoadFromBMSFile( const CString &sPath, Steps &out, const map<CSt
 				{
 					float fPercentThroughMeasure = (float)j/(float)uNumNotesInThisMeasure;
 
-					const int row = (int) ( (iMeasureNo + fPercentThroughMeasure)
-									 * BEATS_PER_MEASURE * ROWS_PER_BEAT );
+					int row = (int) ( (iMeasureNo + fPercentThroughMeasure)
+						* BEATS_PER_MEASURE * ROWS_PER_BEAT );
+
+					// some BMS files seem to have funky alignment, causing us to write gigantic cache files.
+					// Try to correct for this by quantizing.
+					row = froundf( row, ROWS_PER_MEASURE/64 );
+						
 					BmsTrack bmsTrack;
 					bool bIsHold;
 					if( ConvertRawTrackToTapNote(iRawTrackNum, bmsTrack, bIsHold) )