2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index c7563bf298d..b70687f67bb 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -2182,9 +2182,9 @@ public:
         float x, y, z;
         motionMaster->GetDestination(x, y, z);
 
-        for (uint8 i = 0; i < MAX_MOTION_SLOT; ++i)
+        for (uint8 itr = 0; itr < MAX_MOTION_SLOT; ++itr)
         {
-            MovementGenerator* movementGenerator = motionMaster->GetMotionSlot(i);
+            MovementGenerator* movementGenerator = motionMaster->GetMotionSlot(MovementSlot(itr));
             if (!movementGenerator)
             {
                 handler->SendSysMessage("Empty");
diff --git a/src/server/scripts/Commands/cs_wp.cpp b/src/server/scripts/Commands/cs_wp.cpp
index 69dc1f8c51a..ad3ccf37669 100644
--- a/src/server/scripts/Commands/cs_wp.cpp
+++ b/src/server/scripts/Commands/cs_wp.cpp
@@ -270,7 +270,7 @@ public:
         stmt->setUInt64(0, guidLow);
         WorldDatabase.Execute(stmt);
 
-        target->UpdateWaypointID(0);
+        target->UpdateCurrentWaypointInfo(0, 0);
 
         stmt = WorldDatabase.GetPreparedStatement(WORLD_UPD_CREATURE_MOVEMENT_TYPE);
         stmt->setUInt8(0, uint8(IDLE_MOTION_TYPE));