diff --git a/stepmania/src/UnlockManager.cpp b/stepmania/src/UnlockManager.cpp
index 2c5dc559df..4ee01cfbff 100644
--- a/stepmania/src/UnlockManager.cpp
+++ b/stepmania/src/UnlockManager.cpp
@@ -47,7 +47,8 @@ static const char *UnlockRewardTypeNames[] =
 };
 XToString( UnlockRewardType, NUM_UnlockRewardType );
 XToLocalizedString( UnlockRewardType );
-LuaFunction( UnlockRewardTypeToLocalizedString, UnlockRewardTypeToLocalizedString((UnlockRewardType) IArg(1)) );
+LuaXType( UnlockRewardType );
+LuaFunction( UnlockRewardTypeToLocalizedString, UnlockRewardTypeToLocalizedString(Enum::Check<UnlockRewardType>(L, 1)) );
 
 UnlockManager::UnlockManager()
 {
diff --git a/stepmania/src/UnlockManager.h b/stepmania/src/UnlockManager.h
index 5c97d07687..fe3cad32d7 100644
--- a/stepmania/src/UnlockManager.h
+++ b/stepmania/src/UnlockManager.h
@@ -39,6 +39,7 @@ enum UnlockRewardType {
 };
 const RString& UnlockRewardTypeToString( UnlockRewardType i );
 const RString& UnlockRewardTypeToLocalizedString( UnlockRewardType i );
+LuaDeclareType( UnlockRewardType );
 
 enum UnlockEntryStatus {
 	UnlockEntryStatus_RequrementsNotMet, 
diff --git a/stepmania/src/Workout.cpp b/stepmania/src/Workout.cpp
index 73cefcd220..6e08cd44d6 100644
--- a/stepmania/src/Workout.cpp
+++ b/stepmania/src/Workout.cpp
@@ -29,7 +29,8 @@ static const char *WorkoutStepsTypeNames[] = {
 XToString( WorkoutStepsType, NUM_WorkoutStepsType );
 StringToX( WorkoutStepsType );
 XToLocalizedString( WorkoutStepsType );
-LuaFunction( WorkoutStepsTypeToLocalizedString, WorkoutStepsTypeToLocalizedString((WorkoutStepsType) IArg(1)) );
+LuaXType( WorkoutStepsType );
+LuaFunction( WorkoutStepsTypeToLocalizedString, WorkoutStepsTypeToLocalizedString(Enum::Check<WorkoutStepsType>(L, 1)) );
 
 
 Workout::Workout()
diff --git a/stepmania/src/Workout.h b/stepmania/src/Workout.h
index 0111e230b2..e2b1def481 100644
--- a/stepmania/src/Workout.h
+++ b/stepmania/src/Workout.h
@@ -27,6 +27,7 @@ enum WorkoutStepsType
 };
 const RString& WorkoutStepsTypeToLocalizedString( WorkoutStepsType i );
 WorkoutStepsType StringToWorkoutStepsType( const RString& str );
+LuaDeclareType( WorkoutStepsType );
 
 
 const int MIN_WORKOUT_MINUTES = 4;