diff --git a/stepmania/src/GameConstantsAndTypes.cpp b/stepmania/src/GameConstantsAndTypes.cpp
index f362759856..805641bcd0 100644
--- a/stepmania/src/GameConstantsAndTypes.cpp
+++ b/stepmania/src/GameConstantsAndTypes.cpp
@@ -70,7 +70,6 @@ XToLocalizedString( PlayMode );
 StringToX( PlayMode );
 LuaXToString( PlayMode );
 LuaFunction( PlayModeToLocalizedString, PlayModeToLocalizedString((PlayMode) IArg(1)) );
-LuaXType( PlayMode, NUM_PlayMode, "PLAY_MODE_", true )
 LuaXType2( PlayMode, NUM_PlayMode, "PlayMode_" )
 
 RankingCategory AverageMeterToRankingCategory( int iAverageMeter )
@@ -195,6 +194,7 @@ static const char *TapNoteScoreNames[] = {
 	"W1",
 };
 XToString( TapNoteScore, NUM_TapNoteScore );
+LuaXType2( TapNoteScore, NUM_TapNoteScore, "TapNoteScore_" );
 TapNoteScore StringToTapNoteScore( const RString &s )
 {
 	// new style
diff --git a/stepmania/src/GameConstantsAndTypes.h b/stepmania/src/GameConstantsAndTypes.h
index 85487f0293..6ac93e4daa 100644
--- a/stepmania/src/GameConstantsAndTypes.h
+++ b/stepmania/src/GameConstantsAndTypes.h
@@ -146,6 +146,7 @@ enum TapNoteScore {
 const RString& TapNoteScoreToString( TapNoteScore tns );
 const RString& TapNoteScoreToLocalizedString( TapNoteScore tns );
 TapNoteScore StringToTapNoteScore( const RString& str );
+LuaDeclareType( TapNoteScore );
 
 
 enum HoldNoteScore 
diff --git a/stepmania/src/Grade.cpp b/stepmania/src/Grade.cpp
index 2c7799c778..55bf646e04 100644
--- a/stepmania/src/Grade.cpp
+++ b/stepmania/src/Grade.cpp
@@ -8,6 +8,30 @@
 #include "LuaFunctions.h"
 
 LuaFunction( GradeToString,			GradeToString((Grade)IArg(1)) )
+static const char *GradeNames[] = {
+	"Tier01",
+	"Tier02",
+	"Tier03",
+	"Tier04",
+	"Tier05",
+	"Tier06",
+	"Tier07",
+	"Tier08",
+	"Tier09",
+	"Tier10",
+	"Tier11",
+	"Tier12",
+	"Tier13",
+	"Tier14",
+	"Tier15",
+	"Tier16",
+	"Tier17",
+	"Tier18",
+	"Tier19",
+	"Tier20",
+	"Failed",
+};
+LuaXType2( Grade, NUM_Grade, "Grade_" );
 
 RString GradeToLocalizedString( Grade g )
 {
diff --git a/stepmania/src/Grade.h b/stepmania/src/Grade.h
index 66effb59ba..56b50ab6f7 100644
--- a/stepmania/src/Grade.h
+++ b/stepmania/src/Grade.h
@@ -50,6 +50,7 @@ static inline RString GradeToString( Grade g )
 RString GradeToOldString( Grade g );	// "AAA", "B", etc for backward compatibility.  Used in announcer
 RString GradeToLocalizedString( Grade g );
 Grade StringToGrade( const RString &s );
+LuaDeclareType( Grade );
 #define FOREACH_Grade( g ) FOREACH_ENUM( Grade, NUM_Grade, g )
 #define FOREACH_UsedGrade( g ) FOREACH_ENUM( Grade, THEME->GetMetricI("PlayerStageStats","NumGradeTiersUsed"), g )