diff --git a/zone/lua_general.cpp b/zone/lua_general.cpp
index ebb63b0bd..1fb257150 100644
--- a/zone/lua_general.cpp
+++ b/zone/lua_general.cpp
@@ -3085,9 +3085,13 @@ luabind::scope lua_register_skills() {
 		.enum_("constants")
 		[
 			luabind::value("1HBlunt", EQ::skills::Skill1HBlunt),
+			luabind::value("Blunt1H", EQ::skills::Skill1HBlunt),
 			luabind::value("1HSlashing", EQ::skills::Skill1HSlashing),
+			luabind::value("Slashing1H", EQ::skills::Skill1HSlashing),
 			luabind::value("2HBlunt", EQ::skills::Skill2HBlunt),
+			luabind::value("Blunt2H", EQ::skills::Skill2HBlunt),
 			luabind::value("2HSlashing", EQ::skills::Skill2HSlashing),
+			luabind::value("Slashing2H", EQ::skills::Skill2HSlashing),
 			luabind::value("Abjuration", EQ::skills::SkillAbjuration),
 			luabind::value("Alteration", EQ::skills::SkillAlteration),
 			luabind::value("ApplyPoison", EQ::skills::SkillApplyPoison),
@@ -3122,6 +3126,7 @@ luabind::scope lua_register_skills() {
 			luabind::value("Parry", EQ::skills::SkillParry),
 			luabind::value("PickLock", EQ::skills::SkillPickLock),
 			luabind::value("1HPiercing", EQ::skills::Skill1HPiercing),
+			luabind::value("Piercing1H", EQ::skills::Skill1HPiercing),
 			luabind::value("Riposte", EQ::skills::SkillRiposte),
 			luabind::value("RoundKick", EQ::skills::SkillRoundKick),
 			luabind::value("SafeFall", EQ::skills::SkillSafeFall),
@@ -3163,6 +3168,7 @@ luabind::scope lua_register_skills() {
 			luabind::value("RemoveTraps", EQ::skills::SkillRemoveTraps),
 			luabind::value("TripleAttack", EQ::skills::SkillTripleAttack),
 			luabind::value("2HPiercing", EQ::skills::Skill2HPiercing),
+			luabind::value("Piercing2H", EQ::skills::Skill2HPiercing),
 			luabind::value("HIGHEST_SKILL", EQ::skills::HIGHEST_SKILL)
 		];
 }
diff --git a/zone/spells.cpp b/zone/spells.cpp
index 282d8d0d4..ea925ecda 100644
--- a/zone/spells.cpp
+++ b/zone/spells.cpp
@@ -2353,7 +2353,7 @@ bool Mob::SpellFinished(uint16 spell_id, Mob *spell_target, CastingSlot slot, ui
 					SpellOnTarget(spell_id, spell_target);
 	#ifdef GROUP_BUFF_PETS
 					//pet too
-					if (spells[spell_id].targettype != ST_GroupNoPets && spell_target->GetPet() && HasPetAffinity() && !spell_target->GetPet()->IsCharmed())
+					if (spells[spell_id].targettype != ST_GroupNoPets && spell_target->GetPet() && spell_target->HasPetAffinity() && !spell_target->GetPet()->IsCharmed())
 						SpellOnTarget(spell_id, spell_target->GetPet());
 	#endif
 				}