diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 81a055bd28..24e02ae017 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -817,6 +817,7 @@ InGameRoomColor=1.0,0.1,0.1,1.0
 [ScreenSMOnlineSelectMusic]
 PrevScreen=ScreenNetRoom
 Class=ScreenNetSelectMusic
+RoomSelectScreen=ScreenNetRoom
 Fallback=ScreenNetSelectMusic
 
 [ScreenNetSelectMusic]
@@ -2921,7 +2922,7 @@ Line5=conf,EventMode
 
 [ScreenMachineOptions]
 Fallback=ScreenOptionsSubmenu
-LineNames=1,2,3,4,5,6,7,8,9,10
+LineNames=1,2,3,4,5,6,7,8,9,10,11
 OptionMenuFlags=together;explanations
 Line1=conf,MenuTimer
 Line2=conf,ScoringType
@@ -2933,6 +2934,8 @@ Line7=conf,ProgressiveNonstopLifebar
 Line8=conf,DefaultFailType
 Line9=conf,ShowSongOptions
 Line10=conf,ShowNameEntry
+Line11=conf,MarvelousTiming
+
 
 [ScreenGraphicOptions]
 Fallback=ScreenOptionsSubmenu
@@ -3485,7 +3488,7 @@ TimerSeconds=30
 StyleIcon=0
 MemoryCardIcons=0
 CapitalizeAllOptionNames=0
-LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14
+LineNames=1,2,3,4,5,6,7,8,9,10,11,12,13,14,15
 OptionMenuFlags=
 Line1=list,Speed
 Line2=list,Accel