diff --git a/stepmania/src/NotesLoaderDWI.cpp b/stepmania/src/NotesLoaderDWI.cpp
index 277ab5bd50..a6e45c7fdb 100644
--- a/stepmania/src/NotesLoaderDWI.cpp
+++ b/stepmania/src/NotesLoaderDWI.cpp
@@ -310,7 +310,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out )
 			{
 				CStringArray arrayFreezeValues;
 				split( arrayFreezeExpressions[f], "=", arrayFreezeValues );
-				float fIndex = atoi( arrayFreezeValues[0] ) * ROWS_PER_BEAT / 4.0f;
+				float fIndex = (float)atof( arrayFreezeValues[0] ) * ROWS_PER_BEAT / 4.0f;
 				float fFreezeBeat = NoteRowToBeat( fIndex );
 				float fFreezeSeconds = (float)atof( arrayFreezeValues[1] ) / 1000.0f;
 				
@@ -332,7 +332,7 @@ bool DWILoader::LoadFromDWIFile( CString sPath, Song &out )
 					LOG->Warn( "Invalid CHANGEBPM: \"%s\"", arrayBPMChangeExpressions[b]);
 					continue;
 				}
-				float fIndex = atoi( arrayBPMChangeValues[0] ) * ROWS_PER_BEAT / 4.0f;
+				float fIndex = (float)atof( arrayBPMChangeValues[0] ) * ROWS_PER_BEAT / 4.0f;
 				float fBeat = NoteRowToBeat( fIndex );
 				float fNewBPM = (float)atof( arrayBPMChangeValues[1] );
 				
diff --git a/stepmania/src/ScreenMusicScroll.h b/stepmania/src/ScreenMusicScroll.h
index 39a02792f5..e1cd707cc4 100644
--- a/stepmania/src/ScreenMusicScroll.h
+++ b/stepmania/src/ScreenMusicScroll.h
@@ -17,7 +17,7 @@
 #include "MenuElements.h"
 
 
-const int MAX_MUSIC_LINES = 700;
+const int MAX_MUSIC_LINES = 20;
 const int MAX_CREDIT_LINES = 100;
 const int MAX_TOTAL_LINES = MAX_MUSIC_LINES + MAX_CREDIT_LINES;