diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini
index 359a288f70..99d3cf5e85 100644
--- a/stepmania/Themes/default/metrics.ini
+++ b/stepmania/Themes/default/metrics.ini
@@ -2216,7 +2216,7 @@ InitialValue=0.5
 StreamNormalOnCommand=
 StreamHotOnCommand=
 StreamPassingOnCommand=
-MinStayAlive=TNS_W3
+MinStayAlive="TapNoteScore_W3"
 
 [LifeMeterTime]
 Fallback="LifeMeterBar"
@@ -4363,8 +4363,8 @@ UseNameBlacklist=false
 DefaultSort="Group"
 DefaultSong=""
 AreStageModsForced=AreStageModsForced
-GradeTierForExtra1=Grade_Tier03
-GradeTierForExtra2=Grade_Tier03
+GradeTierForExtra1="Grade_Tier03"
+GradeTierForExtra2="Grade_Tier03"
 
 [ScreenMiniMenuContext]
 Fallback="ScreenMiniMenu"
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index e6a85386c5..afbcd0be58 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -60,8 +60,8 @@ Song* GameState::GetDefaultSong() const
 	return sid.ToSong();
 }
 
-static const ThemeMetric<int> GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1");
-static const ThemeMetric<int> GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2");
+static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_1 ("GameState","GradeTierForExtra1");
+static const ThemeMetric<Grade> GRADE_TIER_FOR_EXTRA_2 ("GameState","GradeTierForExtra2");
 
 static DynamicThemeMetric<bool> ARE_STAGE_MODS_FORCED( "GameState","AreStageModsForced" );
 
diff --git a/stepmania/src/LifeMeterBar.cpp b/stepmania/src/LifeMeterBar.cpp
index 4b5c447045..3087dbf461 100644
--- a/stepmania/src/LifeMeterBar.cpp
+++ b/stepmania/src/LifeMeterBar.cpp
@@ -42,7 +42,7 @@ static ThemeMetric<float> DANGER_THRESHOLD	("LifeMeterBar","DangerThreshold");
 static ThemeMetric<int>   NUM_CHAMBERS		("LifeMeterBar","NumChambers");
 static ThemeMetric<int>   NUM_STRIPS		("LifeMeterBar","NumStrips");
 static ThemeMetric<float> INITIAL_VALUE		("LifeMeterBar","InitialValue");
-static ThemeMetric<int>   MIN_STAY_ALIVE	("LifeMeterBar","MinStayAlive");
+static ThemeMetric<TapNoteScore>   MIN_STAY_ALIVE	("LifeMeterBar","MinStayAlive");
 
 const float FAIL_THRESHOLD = 0;