diff --git a/sources/NiceHumanPawn.uc b/sources/NiceHumanPawn.uc
index 9b500a6..58a48f7 100644
--- a/sources/NiceHumanPawn.uc
+++ b/sources/NiceHumanPawn.uc
@@ -737,6 +737,7 @@ simulated function TakeDamage(int Damage, Pawn InstigatedBy, Vector Hitlocation,
     local float healPotency;
     local bool bOldArmorStops;
     local float adrResistance;
+    local float oldHealthToGive;
     local NicePlayerController nicePlayer;
     ApplyWeaponStats(Weapon);
     if(invincibilityTimer > 0)
@@ -767,7 +768,12 @@ simulated function TakeDamage(int Damage, Pawn InstigatedBy, Vector Hitlocation,
            damageType.default.bArmorStops = true;
     }
     lastExplosionDistance = 0.0;    // hack, but scrn fucks with usotherwise
+    oldHealthToGive = healthToGive; // remember this to restore this value, in case we are using safeguard skill
     super.TakeDamage(Damage, InstigatedBy, hitLocation, Momentum, damageType, HitIndex);
+    if (class'NiceVeterancyTypes'.static.HasSkill(nicePlayer, class'NiceSkillHeavySafeguard')) {
+        healthToGive = oldHealthToGive;
+        clientHealthToGive = healthToGive;
+    }
     // Commando's zed time
     if( forcedZedTimeCountDown <= 0.0
        && health < class'NiceSkillCommandoCriticalFocus'.default.healthBoundary && KFGameType(Level.Game) != none
@@ -790,7 +796,7 @@ simulated function TakeDamage(int Damage, Pawn InstigatedBy, Vector Hitlocation,
        if(ShieldStrength < 0)
            ShieldStrength = 0;
        health += HealAmount * 0.5;
-       TakeHealing(self, HealAmount * 0.5, HealPotency);
+       TakeHealing(self, HealAmount * 0.5 + 1, HealPotency);
     }
     if(ShieldStrength <= 0)
        getFreeJacket();
diff --git a/sources/Perks/Enforcer/NiceVetEnforcer.uc b/sources/Perks/Enforcer/NiceVetEnforcer.uc
index c1b8182..141af22 100644
--- a/sources/Perks/Enforcer/NiceVetEnforcer.uc
+++ b/sources/Perks/Enforcer/NiceVetEnforcer.uc
@@ -185,7 +185,7 @@ defaultproperties
     SkillGroupA(4)=class'NiceSkillEnforcerZEDBarrage'
     SkillGroupB(0)=class'NiceSkillEnforcerUnkillable'
     SkillGroupB(1)=class'NiceSkillEnforcerMultitasker'
-    SkillGroupB(2)=class'NiceSkillEnforcerFinisherRounds'
+    SkillGroupB(2)=class'NiceSkillHeavySafeguard'
     SkillGroupB(3)=class'NiceSkillEnforcerBruteA'
     SkillGroupB(4)=class'NiceSkillEnforcerZEDIceGiant'
     progressArray0(0)=100