diff --git a/methods/CMangos/ItemMethods.h b/methods/CMangos/ItemMethods.h
index 29edd3f56b..80264b2f58 100644
--- a/methods/CMangos/ItemMethods.h
+++ b/methods/CMangos/ItemMethods.h
@@ -845,12 +845,15 @@ namespace LuaItem
 #else
         { "IsCurrencyToken", METHOD_REG_NONE },
 #endif
-#if ELUNA_EXPANSION == EXP_WOTLK
+#if ELUNA_EXPANSION >= EXP_WOTLK
         { "IsBoundAccountWide", &LuaItem::IsBoundAccountWide },
+#else
+        { "IsBoundAccountWide", METHOD_REG_NONE },
+#endif
+#if ELUNA_EXPANSION == EXP_WOTLK
         { "IsWeaponVellum", &LuaItem::IsWeaponVellum },
         { "IsArmorVellum", &LuaItem::IsArmorVellum },
 #else
-        { "IsBoundAccountWide", METHOD_REG_NONE },
         { "IsWeaponVellum", METHOD_REG_NONE },
         { "IsArmorVellum", METHOD_REG_NONE },
 #endif
diff --git a/methods/CMangos/PlayerMethods.h b/methods/CMangos/PlayerMethods.h
index c9ed51cefd..be6ea5f788 100644
--- a/methods/CMangos/PlayerMethods.h
+++ b/methods/CMangos/PlayerMethods.h
@@ -724,7 +724,7 @@ namespace LuaPlayer
     }
 #endif
 
-#if ELUNA_EXPANSION == EXP_WOTLK
+#if ELUNA_EXPANSION >= EXP_WOTLK
     /**
      * Returns the normal phase of the player instead of the actual phase possibly containing GM phase
      *
@@ -3802,7 +3802,7 @@ namespace LuaPlayer
         { "GetArenaPoints", METHOD_REG_NONE },
         { "GetHonorPoints", METHOD_REG_NONE },
 #endif
-#if ELUNA_EXPANSION == EXP_WOTLK
+#if ELUNA_EXPANSION >= EXP_WOTLK
         { "GetPhaseMaskForSpawn", &LuaPlayer::GetPhaseMaskForSpawn },
         { "GetActiveSpec", &LuaPlayer::GetActiveSpec },
         { "GetSpecsCount", &LuaPlayer::GetSpecsCount },
@@ -3916,7 +3916,7 @@ namespace LuaPlayer
         { "CanFly", METHOD_REG_NONE },
         { "IsFlying", METHOD_REG_NONE },
 #endif
-#if ELUNA_EXPANSION == EXP_WOTLK
+#if ELUNA_EXPANSION >= EXP_WOTLK
         { "HasAchieved", &LuaPlayer::HasAchieved },
         { "HasTalent", &LuaPlayer::HasTalent },
         { "CanTitanGrip", &LuaPlayer::CanTitanGrip },
@@ -4019,7 +4019,7 @@ namespace LuaPlayer
         { "ModifyHonorPoints", METHOD_REG_NONE },
         { "ModifyArenaPoints", METHOD_REG_NONE },
 #endif
-#if ELUNA_EXPANSION == EXP_WOTLK
+#if ELUNA_EXPANSION >= EXP_WOTLK
         { "ResetPetTalents", &LuaPlayer::ResetPetTalents },
         { "ResetAchievements", &LuaPlayer::ResetAchievements },
         { "SendMovieStart", &LuaPlayer::SendMovieStart },
diff --git a/methods/CMangos/UnitMethods.h b/methods/CMangos/UnitMethods.h
index 31e13e92fb..c549964267 100644
--- a/methods/CMangos/UnitMethods.h
+++ b/methods/CMangos/UnitMethods.h
@@ -2641,7 +2641,11 @@ namespace LuaUnit
 #if ELUNA_EXPANSION >= EXP_TBC
         { "IsOnVehicle", &LuaUnit::IsOnVehicle },
         { "RemoveArenaAuras", &LuaUnit::RemoveArenaAuras },
-#elif ELUNA_EXPANSION >= EXP_WOTLK
+#else
+        { "IsOnVehicle", METHOD_REG_NONE },
+        { "RemoveArenaAuras", METHOD_REG_NONE },
+#endif
+#if ELUNA_EXPANSION >= EXP_WOTLK
         { "GetCritterGUID", &LuaUnit::GetCritterGUID },
         { "GetVehicleKit", &LuaUnit::GetVehicleKit },
         { "SetFFA", &LuaUnit::SetFFA },
@@ -2654,8 +2658,6 @@ namespace LuaUnit
         { "SetFFA", METHOD_REG_NONE },
         { "SetSanctuary", METHOD_REG_NONE },
         { "SetCritterGUID", METHOD_REG_NONE },
-        { "IsOnVehicle", METHOD_REG_NONE },
-        { "RemoveArenaAuras", METHOD_REG_NONE },
         { "MoveJump", METHOD_REG_NONE },
 #endif
 
diff --git a/methods/CMangos/WorldObjectMethods.h b/methods/CMangos/WorldObjectMethods.h
index aae9402a52..fd9112a565 100644
--- a/methods/CMangos/WorldObjectMethods.h
+++ b/methods/CMangos/WorldObjectMethods.h
@@ -1154,7 +1154,7 @@ namespace LuaWorldObject
         { "GetExactDistance2d", &LuaWorldObject::GetExactDistance2d },
         { "GetRelativePoint", &LuaWorldObject::GetRelativePoint },
         { "GetAngle", &LuaWorldObject::GetAngle },
-#if ELUNA_EXPANSION == EXP_WOTLK
+#if ELUNA_EXPANSION > EXP_TBC
         { "GetPhaseMask", &LuaWorldObject::GetPhaseMask },
         { "SetPhaseMask", &LuaWorldObject::SetPhaseMask },
 #else