diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index 3eb9761f2..ec91d48d6 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -3036,7 +3036,7 @@ bool Creature::SetSwim(bool enable)
  */
 bool Creature::CanSwim() const
 {
-    if (Unit::CanSwim() || (!Unit::CanSwim() && !CanFly()))
+    if (Unit::CanSwim())
         return true;
 
     if (IsPet())
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
index 7bf5d1e48..6f9143d9c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
@@ -958,7 +958,6 @@ struct npc_drakonid_spawner : public ScriptedAI
 
             ObjectGuid summonGuid = summon->GetGUID();
 
-            summon->SetCorpseDelay(DAY * IN_MILLISECONDS);
             summon->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
             summon->SetHomePosition(summon->GetPosition());
 
@@ -976,6 +975,7 @@ struct npc_drakonid_spawner : public ScriptedAI
                     construct->SetReactState(REACT_PASSIVE);
                     construct->SetStandState(UNIT_STAND_STATE_DEAD);
                     construct->SetUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+                    construct->SetCorpseRemoveTime(DAY * IN_MILLISECONDS);
                     construct->SetVisible(true);
                 }
             });