diff --git a/Game/BattleGrounds/Zones/EyeofStorm.cs b/Game/BattleGrounds/Zones/EyeofStorm.cs
index bc4ee9188..e2f082cc6 100644
--- a/Game/BattleGrounds/Zones/EyeofStorm.cs
+++ b/Game/BattleGrounds/Zones/EyeofStorm.cs
@@ -278,11 +278,11 @@ namespace Game.BattleGrounds
                         {
                             //point was uncontrolled and player is from team which captured point
                             if (m_PointState[point] == EotSPointState.Uncontrolled && (uint)player.GetTeam() == pointOwnerTeamId)
-                                EventTeamCapturedPo(player, point);
+                                EventTeamCapturedPoint(player, point);
 
                             //point was under control and player isn't from team which controlled it
                             if (m_PointState[point] == EotSPointState.UnderControl && player.GetTeam() != m_PointOwnedByTeam[point])
-                                EventTeamLostPo(player, point);
+                                EventTeamLostPoint(player, point);
                         }
 
                         /// @workaround The original AreaTrigger is covered by a bigger one and not triggered on client side.
@@ -524,8 +524,7 @@ namespace Game.BattleGrounds
                     Log.outError(LogFilter.Battleground, "BattlegroundEY: Could not spawn Speedbuff Fel Reaver.");
             }
 
-            WorldSafeLocsRecord sg = null;
-            sg = CliDB.WorldSafeLocsStorage.LookupByKey(EotSGaveyardIds.MainAlliance);
+            WorldSafeLocsRecord sg = CliDB.WorldSafeLocsStorage.LookupByKey(EotSGaveyardIds.MainAlliance);
             if (sg == null || !AddSpiritGuide(EotSGaveyardIds.MainAlliance, sg.Loc.X, sg.Loc.Y, sg.Loc.Z, 3.124139f, TeamId.Alliance))
             {
                 Log.outError(LogFilter.Sql, "BatteGroundEY: Failed to spawn spirit guide. The battleground was not created.");
@@ -682,7 +681,7 @@ namespace Game.BattleGrounds
                 SendMessageToAll(CypherStrings.BgEyHasTakenFlag, ChatMsg.BgSystemHorde, null, player.GetName());
         }
 
-        void EventTeamLostPo(Player player, int Point)
+        void EventTeamLostPoint(Player player, int Point)
         {
             if (GetStatus() != BattlegroundStatus.InProgress)
                 return;
@@ -730,7 +729,7 @@ namespace Game.BattleGrounds
                 DelCreature(Point + 6);//null checks are in DelCreature! 0-5 spirit guides
         }
 
-        void EventTeamCapturedPo(Player player, int Point)
+        void EventTeamCapturedPoint(Player player, int Point)
         {
             if (GetStatus() != BattlegroundStatus.InProgress)
                 return;
@@ -769,8 +768,7 @@ namespace Game.BattleGrounds
             if (BgCreatures.ContainsKey(Point) && !BgCreatures[Point].IsEmpty())
                 DelCreature(Point);
 
-            WorldSafeLocsRecord sg = null;
-            sg = CliDB.WorldSafeLocsStorage.LookupByKey(EotSMisc.m_CapturingPointTypes[Point].GraveYardId);
+            WorldSafeLocsRecord sg = CliDB.WorldSafeLocsStorage.LookupByKey(EotSMisc.m_CapturingPointTypes[Point].GraveYardId);
             if (sg == null || !AddSpiritGuide(Point, sg.Loc.X, sg.Loc.Y, sg.Loc.Z, 3.124139f, GetTeamIndexByTeamId(Team)))
                 Log.outError(LogFilter.Battleground, "BatteGroundEY: Failed to spawn spirit guide. point: {0}, team: {1}, graveyard_id: {2}",
                     Point, Team, EotSMisc.m_CapturingPointTypes[Point].GraveYardId);
diff --git a/Game/Globals/ObjectManager.cs b/Game/Globals/ObjectManager.cs
index 63ed00f05..df7f4a7ca 100644
--- a/Game/Globals/ObjectManager.cs
+++ b/Game/Globals/ObjectManager.cs
@@ -2442,9 +2442,9 @@ namespace Game
                 if (displayEntry == null)
                 {
                     Log.outError(LogFilter.Sql, "Creature (Entry: {0}) lists non-existing Modelid1 id ({1}), this can crash the client.", cInfo.Entry, cInfo.ModelId1);
-                    //cInfo.ModelId1 = 0;
+                    cInfo.ModelId1 = 0;
                 }
-                else if (displayScaleEntry == null)
+                else
                     displayScaleEntry = displayEntry;
 
                 CreatureModelInfo modelInfo = GetCreatureModelInfo(cInfo.ModelId1);
diff --git a/Game/Groups/Group.cs b/Game/Groups/Group.cs
index 41b3f4d48..4e3527884 100644
--- a/Game/Groups/Group.cs
+++ b/Game/Groups/Group.cs
@@ -1266,8 +1266,7 @@ namespace Game.Groups
 
                 // remove is_blocked so that the item is lootable by all players
                 LootItem item = roll.itemSlot >= roll.getLoot().items.Count ? roll.getLoot().quest_items[roll.itemSlot - roll.getLoot().items.Count] : roll.getLoot().items[roll.itemSlot];
-                if (item != null)
-                    item.is_blocked = false;
+                item.is_blocked = false;
             }
 
             SendLootRollsComplete(roll);
diff --git a/Game/Maps/Map.cs b/Game/Maps/Map.cs
index 3fd4bc2ec..8733cec0a 100644
--- a/Game/Maps/Map.cs
+++ b/Game/Maps/Map.cs
@@ -808,7 +808,7 @@ namespace Game.Maps
 
         public void PlayerRelocation(Player player, float x, float y, float z, float orientation)
         {
-            var oldcell = new Cell(player.GetPositionX(), player.GetPositionY());
+            var oldcell = player.GetCurrentCell();
             var newcell = new Cell(x, y);
 
             //! If hovering, always increase our server-side Z position
@@ -823,8 +823,7 @@ namespace Game.Maps
 
             if (oldcell.DiffGrid(newcell) || oldcell.DiffCell(newcell))
             {
-                Log.outDebug(LogFilter.Maps,
-                    "Player {0} relocation grid[{1}, {2}]cell[{3}, {4}].grid[{5}, {6}]cell[{7}, {8}]",
+                Log.outDebug(LogFilter.Maps, "Player {0} relocation grid[{1}, {2}]cell[{3}, {4}].grid[{5}, {6}]cell[{7}, {8}]",
                     player.GetName(), oldcell.GetGridX(), oldcell.GetGridY(), oldcell.GetCellX(), oldcell.GetCellY(),
                     newcell.GetGridX(), newcell.GetGridY(), newcell.GetCellX(), newcell.GetCellY());
 
diff --git a/Game/Movement/MotionMaster.cs b/Game/Movement/MotionMaster.cs
index 7afa80653..8367456bb 100644
--- a/Game/Movement/MotionMaster.cs
+++ b/Game/Movement/MotionMaster.cs
@@ -392,10 +392,10 @@ namespace Game.Movement
             {
                 init.SetFly();
                 init.SetUncompressed();
+                init.SetSmooth();
             }
 
             init.MovebyPath(pathPoints);
-            init.SetSmooth();
             init.SetWalk(walk);
             init.Launch();