diff --git a/Source/Framework/Constants/MapConst.cs b/Source/Framework/Constants/MapConst.cs
index de0cad3e5..417c88704 100644
--- a/Source/Framework/Constants/MapConst.cs
+++ b/Source/Framework/Constants/MapConst.cs
@@ -75,7 +75,7 @@ namespace Framework.Constants
         public const uint mmapMagic = 0x4D4D4150; // 'MMAP'
         public const int mmapVersion = 10;
 
-        public const string VMapMagic = "VMAP_4.9";
+        public const string VMapMagic = "VMAP_4.A";
         public const float VMAPInvalidHeightValue = -200000.0f;
     }
 
diff --git a/Source/Game/Entities/Unit/Unit.Spells.cs b/Source/Game/Entities/Unit/Unit.Spells.cs
index 80b0fff75..4d9ad465a 100644
--- a/Source/Game/Entities/Unit/Unit.Spells.cs
+++ b/Source/Game/Entities/Unit/Unit.Spells.cs
@@ -2840,14 +2840,15 @@ namespace Game.Entities
                     if (IsTypeId(TypeId.Player))
                         ToPlayer().SendAutoRepeatCancel(this);
 
+                m_currentSpells[spellType] = null;
+
                 if (spell.GetState() != SpellState.Finished)
                     spell.Cancel();
+                else
+                    spell.SetReferencedFromCurrent(false);
 
                 if (IsCreature() && IsAIEnabled)
                     ToCreature().GetAI().OnSpellCastInterrupt(spell.GetSpellInfo());
-
-                m_currentSpells[spellType] = null;
-                spell.SetReferencedFromCurrent(false);
             }
         }
         public void UpdateInterruptMask()
diff --git a/Source/Scripts/Spells/Shaman.cs b/Source/Scripts/Spells/Shaman.cs
index c71d74a64..820c30526 100644
--- a/Source/Scripts/Spells/Shaman.cs
+++ b/Source/Scripts/Spells/Shaman.cs
@@ -725,7 +725,7 @@ namespace Scripts.Spells.Shaman
     [Script] // 192223 - Liquid Magma Totem (erupting hit spell)
     class spell_sha_liquid_magma_totem : SpellScript
     {
-        bool Validate(SpellInfo spellInfo)
+        public override bool Validate(SpellInfo spellInfo)
         {
             return ValidateSpellInfo(SpellIds.LiquidMagmaHit);
         }