diff --git a/ElunaCreatureAI.h b/ElunaCreatureAI.h
index 8462303..1f8c794 100644
--- a/ElunaCreatureAI.h
+++ b/ElunaCreatureAI.h
@@ -37,7 +37,10 @@ struct ElunaCreatureAI : ScriptedAI
 #endif
     {
         if (justSpawned)
+        {
+            justSpawned = false;
             JustRespawned();
+        }
 
         if (!sEluna->UpdateAI(me, diff))
         {
diff --git a/LuaFunctions.cpp b/LuaFunctions.cpp
index 7567219..34be66e 100644
--- a/LuaFunctions.cpp
+++ b/LuaFunctions.cpp
@@ -279,9 +279,7 @@ ElunaRegister<Unit> UnitMethods[] =
     { "GetVehicleKit", &LuaUnit::GetVehicleKit },                         // :GetVehicleKit() - Gets unit's Vehicle kit if the unit is a vehicle
     // {"GetVehicle", &LuaUnit::GetVehicle},                            // :GetVehicle() - Gets the Vehicle kit of the vehicle the unit is on
 #endif
-#ifdef MANGOS
     { "GetMovementType", &LuaUnit::GetMovementType },
-#endif
 
     // Setters
     { "SetFaction", &LuaUnit::SetFaction },                   // :SetFaction(factionId) - Sets the unit's faction