diff --git a/FFXIVClassic Map Server/actors/chara/Character.cs b/FFXIVClassic Map Server/actors/chara/Character.cs
index 9570dd50..0be17a31 100644
--- a/FFXIVClassic Map Server/actors/chara/Character.cs	
+++ b/FFXIVClassic Map Server/actors/chara/Character.cs	
@@ -528,8 +528,8 @@ namespace FFXIVClassic_Map_Server.Actors
             aiContainer.Reset();
             // todo: reset hp/mp/tp etc here
             ChangeState(SetActorStatePacket.MAIN_STATE_PASSIVE);
-            charaWork.parameterSave.hp = charaWork.parameterSave.hpMax;
-            charaWork.parameterSave.mp = charaWork.parameterSave.mpMax;
+            SetHP((uint) GetMaxHP());
+            SetMP((uint) GetMaxMP());
             RecalculateStats();
         }
 
diff --git a/FFXIVClassic Map Server/actors/chara/ai/StatusEffect.cs b/FFXIVClassic Map Server/actors/chara/ai/StatusEffect.cs
index 410f8a23..4f919184 100644
--- a/FFXIVClassic Map Server/actors/chara/ai/StatusEffect.cs	
+++ b/FFXIVClassic Map Server/actors/chara/ai/StatusEffect.cs	
@@ -325,11 +325,11 @@ namespace FFXIVClassic_Map_Server.actors.chara.ai
 
         // custom effects here
         // status for having procs fall off
-        EvadeProc = 253003,
-        BlockProc = 253004,
-        ParryProc = 253005,
-        MissProc = 253006,
-        EXPChain = 253007
+        EvadeProc = 300000,
+        BlockProc = 300001,
+        ParryProc = 300002,
+        MissProc = 300003,
+        EXPChain = 300004
     }
 
     [Flags]
diff --git a/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs b/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs
index 156a6109..e12470cd 100644
--- a/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs	
+++ b/FFXIVClassic Map Server/actors/chara/npc/BattleNpc.cs	
@@ -251,8 +251,6 @@ namespace FFXIVClassic_Map_Server.Actors
             this.hateContainer.ClearHate();
             zone.BroadcastPacketsAroundActor(this, GetSpawnPackets(null, 0x01));
             zone.BroadcastPacketsAroundActor(this, GetInitPackets());
-            charaWork.parameterSave.hp = charaWork.parameterSave.hpMax;
-            charaWork.parameterSave.hp = (short[])charaWork.parameterSave.hpMax.Clone();
             RecalculateStats();
 
             OnSpawn();
diff --git a/data/scripts/commands/ability/shoulder_tackle.lua b/data/scripts/commands/ability/shoulder_tackle.lua
index 596875f0..1f05b3fe 100644
--- a/data/scripts/commands/ability/shoulder_tackle.lua
+++ b/data/scripts/commands/ability/shoulder_tackle.lua
@@ -1,11 +1,11 @@
 require("global");
 require("ability");
 
-function onSkillPrepare(caster, target, skill)
+function onAbilityPrepare(caster, target, ability)
     return 0;
 end;
 
-function onSkillStart(caster, target, skill)
+function onAbilityStart(caster, target, ability)
     return 0;
 end;