diff --git a/sources/Perks/Commando/NiceDamTypeMedicDart.uc b/sources/Perks/Commando/NiceDamTypeMedicDart.uc
index 260ac7a..c64ead0 100644
--- a/sources/Perks/Commando/NiceDamTypeMedicDart.uc
+++ b/sources/Perks/Commando/NiceDamTypeMedicDart.uc
@@ -1,4 +1,4 @@
-class NiceDamTypeMedicDart extends NiceDamageTypeVetCommando
+class NiceDamTypeMedicDart extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {
diff --git a/sources/Perks/Demolitions/NiceVetDemolitions.uc b/sources/Perks/Demolitions/NiceVetDemolitions.uc
index a0c1006..ea36af8 100644
--- a/sources/Perks/Demolitions/NiceVetDemolitions.uc
+++ b/sources/Perks/Demolitions/NiceVetDemolitions.uc
@@ -39,12 +39,13 @@ static function int AddDamage(KFPlayerReplicationInfo KFPRI, KFMonster Injured,
     perkDamage = float(InDamage);
     if(DmgType == class'NiceDamTypeDemoExplosion')
        return 1.6 * perkDamage;
-    if(IsPerkedPickup(pickupClass))
+    if(IsPerkedPickup(pickupClass) && class<NiceDamTypeDemoExplosion>(DmgType) != none)
        perkDamage *= 1.25;
     else if( pickupClass != none && pickupClass.default.weight <= class'NiceSkillDemoOffperk'.default.weightBound
        && HasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillDemoOffperk') )
        perkDamage *= class'NiceSkillDemoOffperk'.default.damageBonus;
-    if( KFPRI != none && class<NiceDamTypeDemoBlunt>(DmgType) != none
+    if( KFPRI != none && class<NiceDamTypeDemoExplosion>(DmgType) == none
+       && IsPerkedPickup(pickupClass)
        && SomeoneHasSkill(NicePlayerController(KFPRI.Owner), class'NiceSkillDemoOnperk') )
        perkDamage *= class'NiceSkillDemoOnperk'.default.damageBonus;
     return perkDamage;
diff --git a/sources/Weapons/Playable/SMG/Kriss/NiceDamTypeKrissM.uc b/sources/Weapons/Playable/SMG/Kriss/NiceDamTypeKrissM.uc
index f728723..7516cbc 100644
--- a/sources/Weapons/Playable/SMG/Kriss/NiceDamTypeKrissM.uc
+++ b/sources/Weapons/Playable/SMG/Kriss/NiceDamTypeKrissM.uc
@@ -1,4 +1,4 @@
-class NiceDamTypeKrissM extends NiceDamageTypeVetCommando
+class NiceDamTypeKrissM extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {
diff --git a/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc b/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc
index d8ec776..043b94d 100644
--- a/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc
+++ b/sources/Weapons/Playable/SMG/Kriss/NiceKrissMPickup.uc
@@ -17,7 +17,7 @@ defaultproperties
     AmmoItemName="45. ACP Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     InventoryType=class'NiceKrissMMedicGun'
     PickupMessage="You got the KRISS Vector Medic Gun"
     PickupSound=Sound'KF_KrissSND.Handling.KF_WEP_KRISS_Handling_Pickup'
diff --git a/sources/Weapons/Playable/SMG/M7A3/NiceDamTypeM7A3M.uc b/sources/Weapons/Playable/SMG/M7A3/NiceDamTypeM7A3M.uc
index e27b99e..96d8965 100644
--- a/sources/Weapons/Playable/SMG/M7A3/NiceDamTypeM7A3M.uc
+++ b/sources/Weapons/Playable/SMG/M7A3/NiceDamTypeM7A3M.uc
@@ -1,4 +1,4 @@
-class NiceDamTypeM7A3M extends NiceDamageTypeVetCommando
+class NiceDamTypeM7A3M extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {
diff --git a/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc b/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc
index 3454139..c75dd32 100644
--- a/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc
+++ b/sources/Weapons/Playable/SMG/M7A3/NiceM7A3MPickup.uc
@@ -14,7 +14,7 @@ defaultproperties
     AmmoItemName="7.6x40mm Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     InventoryType=class'NiceM7A3MMedicGun'
     PickupMessage="You got the M7A3 Medic Gun"
     PickupSound=Sound'KF_M7A3Snd.M7A3_Pickup'
diff --git a/sources/Weapons/Playable/SMG/MP5M/NiceDamTypeMP5M.uc b/sources/Weapons/Playable/SMG/MP5M/NiceDamTypeMP5M.uc
index 3af2db7..ee30a1f 100644
--- a/sources/Weapons/Playable/SMG/MP5M/NiceDamTypeMP5M.uc
+++ b/sources/Weapons/Playable/SMG/MP5M/NiceDamTypeMP5M.uc
@@ -1,4 +1,4 @@
-class NiceDamTypeMP5M extends NiceDamageTypeVetCommando
+class NiceDamTypeMP5M extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {
diff --git a/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc b/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc
index 39f5464..dbd1e37 100644
--- a/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc
+++ b/sources/Weapons/Playable/SMG/MP5M/NiceMP5MPickup.uc
@@ -14,7 +14,7 @@ defaultproperties
     AmmoItemName="9x19mm Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     VariantClasses(0)=Class'KFMod.CamoMP5MPickup'
     InventoryType=class'NiceMP5MMedicGun'
     PickupMessage="You got the MP5M Medic Gun"
diff --git a/sources/Weapons/Playable/SMG/MP7M/NiceDamTypeMP7M.uc b/sources/Weapons/Playable/SMG/MP7M/NiceDamTypeMP7M.uc
index 1076d20..71c97c6 100644
--- a/sources/Weapons/Playable/SMG/MP7M/NiceDamTypeMP7M.uc
+++ b/sources/Weapons/Playable/SMG/MP7M/NiceDamTypeMP7M.uc
@@ -1,4 +1,4 @@
-class NiceDamTypeMP7M extends NiceDamageTypeVetCommando
+class NiceDamTypeMP7M extends NiceDamageTypeVetDemolitions
     abstract;
 defaultproperties
 {
diff --git a/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc b/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc
index 95104e2..cf4f30b 100644
--- a/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc
+++ b/sources/Weapons/Playable/SMG/MP7M/NiceMP7MPickup.uc
@@ -15,7 +15,7 @@ defaultproperties
     AmmoItemName="4.6x30mm Ammo"
     AmmoMesh=StaticMesh'KillingFloorStatics.L85Ammo'
     EquipmentCategoryID=3
-    CorrespondingPerkIndex=3
+    CorrespondingPerkIndex=6
     InventoryType=class'NiceMP7MMedicGun'
     PickupMessage="You got the MP7M Medic Gun"
     PickupSound=Sound'KF_MP7Snd.MP7_Pickup'