diff --git a/stepmania/src/ListDisplay.cpp b/stepmania/src/ListDisplay.cpp
index 265a351616..4f4ba41907 100644
--- a/stepmania/src/ListDisplay.cpp
+++ b/stepmania/src/ListDisplay.cpp
@@ -48,11 +48,11 @@ void ListDisplay::Load(
 	float fSecondsPauseBetweenItems,
 	bool bSlide )
 {
-	ASSERT( iNumItemsToShow > 0 );
-	ASSERT( fItemWidth > 0 );
-	ASSERT( fItemHeight > 0 );
-	ASSERT( fSecondsPerItem > 0 );
-	ASSERT( fSecondsPauseBetweenItems >= 0 );
+	CLAMP( iNumItemsToShow, 1, 10000 );
+	CLAMP( fItemWidth, 1, 10000 );
+	CLAMP( fItemHeight, 1, 10000 );
+	CLAMP( fSecondsPerItem, 0.01f, 10000 );
+	CLAMP( fSecondsPauseBetweenItems, 0, 10000 );
 
 	m_SubActors = m_vpItems;
 	m_iNumItemsToShow = iNumItemsToShow;
diff --git a/stepmania/src/ScreenRanking.cpp b/stepmania/src/ScreenRanking.cpp
index 7c7c0d4f18..4079bde80b 100644
--- a/stepmania/src/ScreenRanking.cpp
+++ b/stepmania/src/ScreenRanking.cpp
@@ -42,7 +42,8 @@
 #define COL_SPACING_X				THEME->GetMetricF("ScreenRanking","ColSpacingX")
 #define COL_SPACING_Y				THEME->GetMetricF("ScreenRanking","ColSpacingY")
 #define STEPS_TYPE_COLOR( i )		THEME->GetMetricC("ScreenRanking",ssprintf("StepsTypeColor%d",i+1))
-#define NUM_ROW_ITEMS_TO_SHOW		THEME->GetMetricI("ScreenRanking","NumRowItemsToShow")
+#define SONG_SCORE_ROWS_TO_SHOW		THEME->GetMetricI("ScreenRanking","SongScoreRowsToShow")
+#define SONG_SCORE_SECONDS_PER_ROW	THEME->GetMetricF("ScreenRanking","SongScoreSecondsPerRow")
 
 #define BULLET_START_X				THEME->GetMetricF("ScreenRanking","BulletStartX")
 #define BULLET_START_Y				THEME->GetMetricF("ScreenRanking","BulletStartY")
@@ -475,7 +476,7 @@ float ScreenRanking::SetPage( PageToShow pts )
 			vector<Actor*> vpActors;
 			for( unsigned i=0; i<m_vpStepsScoreRowItem.size(); i++ )
 				vpActors.push_back( m_vpStepsScoreRowItem[i] );
-			m_ListScoreRowItems.Load( vpActors, NUM_ROW_ITEMS_TO_SHOW, SCREEN_WIDTH, ROW_SPACING_Y, false, 1, 0, false );
+			m_ListScoreRowItems.Load( vpActors, SONG_SCORE_ROWS_TO_SHOW, SCREEN_WIDTH, ROW_SPACING_Y, false, SONG_SCORE_SECONDS_PER_ROW, 0, false );
 
 			for( unsigned s=0; s<num_songs; s++ )
 			{