diff --git a/stepmania/src/RageSound.cpp b/stepmania/src/RageSound.cpp
index 627a551693..df10e67bba 100644
--- a/stepmania/src/RageSound.cpp
+++ b/stepmania/src/RageSound.cpp
@@ -279,7 +279,7 @@ void RageSound::RateChange(char *buf, int &cnt,
 			/* Input 4 samples, output 5; 25% slowdown with no
 			 * rounding error. */
 
-			Sint16 samps[16];
+			Sint16 samps[20];	// max 2x rate
 			ASSERT(size_t(speed_input_samples) <= sizeof(samps)/sizeof(*samps));
 			int s;
 			for(s = 0; s < speed_input_samples; ++s) {
diff --git a/stepmania/src/ScreenSongOptions.cpp b/stepmania/src/ScreenSongOptions.cpp
index 02e8f859c1..668e0c6bbe 100644
--- a/stepmania/src/ScreenSongOptions.cpp
+++ b/stepmania/src/ScreenSongOptions.cpp
@@ -39,7 +39,7 @@ OptionRow g_SongOptionsLines[NUM_SONG_OPTIONS_LINES] = {
 	OptionRow( "Bat\nLives",	"1","2","3","4","5","6","7","8","9","10" ),	
 	OptionRow( "Fail",			"ARCADE","END OF SONG","OFF" ),	
 	OptionRow( "Assist\nTick",	"OFF", "ON" ),
-	OptionRow( "Rate",			"x0.3","x0.4","x0.5","x0.6","x0.7","x0.8","x0.9","x1.0","x1.1","x1.2","x1.3","x1.4","x1.5","x1.6","x1.7","x1.8","x1.9","x2.0" ),	
+	OptionRow( "Rate",			"0.3x","0.4x","0.5x","0.6x","0.7x","0.8x","0.9x","1.0x","1.1x","1.2x","1.3x","1.4x","1.5x","1.6x","1.7x","1.8x","1.9x","2.0x" ),	
 	OptionRow( "Auto\nAdjust",	"OFF", "ON" ),	
 };