diff --git a/stepmania/src/ScreenSelect.cpp b/stepmania/src/ScreenSelect.cpp
index 3b52be2bb5..e02192cf9b 100644
--- a/stepmania/src/ScreenSelect.cpp
+++ b/stepmania/src/ScreenSelect.cpp
@@ -121,7 +121,7 @@ void ScreenSelect::Update( float fDelta )
 		}
 	}
 
-	Screen::Update( fDelta );
+	ScreenWithMenuElements::Update( fDelta );
 }
 
 void ScreenSelect::DrawPrimitives()
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 5ea853ba64..9e77b7f5dc 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -818,7 +818,7 @@ void ThemeManager::GetMetric( const CString &sClassName, const CString &sValueNa
 void ThemeManager::GetMetric( const CString &sClassName, const CString &sValueName, LuaExpression &valueOut )
 {
 	CString sValue = GetMetricRaw( sClassName, sValueName );
-	valueOut.SetFromExpression( sValue );
+	valueOut.SetFromExpression( "function(self) " + sValue + "end" );
 }
 
 // lua start