diff --git a/scripts/_00e_mq17_bossfight_generatorsc.pex b/scripts/_00e_mq17_bossfight_generatorsc.pex
index 32a41a7c..b2e0f211 100644
Binary files a/scripts/_00e_mq17_bossfight_generatorsc.pex and b/scripts/_00e_mq17_bossfight_generatorsc.pex differ
diff --git a/scripts/_00e_nq_g_07_petrifiedcombatsc.pex b/scripts/_00e_nq_g_07_petrifiedcombatsc.pex
index 1997be0a..80949bae 100644
Binary files a/scripts/_00e_nq_g_07_petrifiedcombatsc.pex and b/scripts/_00e_nq_g_07_petrifiedcombatsc.pex differ
diff --git a/scripts/_00e_theriantrophist_playeraswerewolf.pex b/scripts/_00e_theriantrophist_playeraswerewolf.pex
index 2eb51953..41f1a38e 100644
Binary files a/scripts/_00e_theriantrophist_playeraswerewolf.pex and b/scripts/_00e_theriantrophist_playeraswerewolf.pex differ
diff --git a/source/scripts/_00e_mq17_bossfight_generatorsc.psc b/source/scripts/_00e_mq17_bossfight_generatorsc.psc
index 375e96d9..1a3d3634 100644
--- a/source/scripts/_00e_mq17_bossfight_generatorsc.psc
+++ b/source/scripts/_00e_mq17_bossfight_generatorsc.psc
@@ -128,6 +128,10 @@ EndFunction
 
 float Function GetDealtDamage(Form akDamageSource)
 
+	if ! SKSE.GetVersion()
+		return 55.0
+	endif
+
 	bool bIsSpell
 	bool bIsArrow
 
diff --git a/source/scripts/_00e_nq_g_07_petrifiedcombatsc.psc b/source/scripts/_00e_nq_g_07_petrifiedcombatsc.psc
index 4253ad2a..f7a18c85 100644
--- a/source/scripts/_00e_nq_g_07_petrifiedcombatsc.psc
+++ b/source/scripts/_00e_nq_g_07_petrifiedcombatsc.psc
@@ -37,7 +37,7 @@ Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile,
 			_00E_NQG07_s_PetrifiedCombatAttackHasNoEffect.Show()		
 			MAGFail.Play(akSelf)
 		Else
-			DamageShield(akSource, akSource.GetType())
+			DamageShield(akSource)
 			MAGShockImpact.Play(akSelf)
 			If !bIsFlickering
 				Flicker()
@@ -129,9 +129,9 @@ Function Flicker()
 	
 EndFunction
 
-Function DamageShield(Form akDamageSource, int iDamageSourceType)
+Function DamageShield(Form akDamageSource)
 
-	__Config_fShieldStrength = __Config_fShieldStrength - GetDealtDamage(akDamageSource, iDamageSourceType)
+	__Config_fShieldStrength = __Config_fShieldStrength - GetDealtDamage(akDamageSource)
 
 	If (__Config_fShieldStrength > 0) && ((fOriginalStrength - fCurrentSubtrahend) >= __Config_fShieldStrength)
 		float fCurrentPercentage = ((__Config_fShieldStrength)/(fOriginalStrength/100))
@@ -145,12 +145,20 @@ Function DamageShield(Form akDamageSource, int iDamageSourceType)
 	
 EndFunction
 
-float Function GetDealtDamage(Form akDamageSource, int iDamageSourceType)
+float Function GetDealtDamage(Form akDamageSource)
 
-	if iDamageSourceType == 41
-		Weapon wpSourceWeapon = akDamageSource as Weapon
+	Weapon wpSourceWeapon = akDamageSource as Weapon
+	
+	if wpSourceWeapon
+		if ! SKSE.GetVersion()
+			if PlayerREF.GetEquippedItemType(1) == 5 || PlayerREF.GetEquippedItemType(1) == 6
+				return 50.0
+			endif
+			return 40
+		endif
+		
 		Return wpSourceWeapon.GetBaseDamage() as Float
-	Elseif iDamageSourceType == 22 || iDamageSourceType == 21
+	Else
 		Return 25.0
 	EndIf
 
diff --git a/source/scripts/_00e_theriantrophist_playeraswerewolf.psc b/source/scripts/_00e_theriantrophist_playeraswerewolf.psc
index fcd8508c..79038742 100644
--- a/source/scripts/_00e_theriantrophist_playeraswerewolf.psc
+++ b/source/scripts/_00e_theriantrophist_playeraswerewolf.psc
@@ -471,7 +471,7 @@ State Transfomed
 	EndEvent
 
 	Event OnObjectEquipped(Form akBaseObject, ObjectReference akReference)
-		if (akBaseObject != _00E_Theriantrophist_Claws) || akBaseObject.GetType() == 119
+		if akBaseObject != _00E_Theriantrophist_Claws
 			self.getActorReference().UnequipItem(akBaseObject)
 			self.getActorReference().equipItem(_00E_Theriantrophist_Claws, abSilent = true)
 		Endif