diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 8e98ac099..62a0d67df 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -2914,7 +2914,7 @@ void Player::SendInitialSpells()
 
         data << uint32(itr->first);
 
-        data << uint16(itr->second.itemid);                 // cast item id
+        data << uint32(itr->second.itemid);                 // cast item id
         data << uint16(sEntry->GetCategory());              // spell category
 
         // send infinity cooldown in special format
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index cb7e5d4f7..33ce67d30 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1773,7 +1773,7 @@ bool SpellMgr::IsSpellProcEventCanTriggeredBy(SpellProcEventEntry const* spellPr
             SpellClassOptionsEntry const* spellClassOptions = procSpell->GetSpellClassOptions();
 
             // Check (if set) for spellFamilyName
-            if (spellProcEvent->spellFamilyName && (!spellClassOptions || spellProcEvent->spellFamilyName != spellClassOptions->SpellFamilyName))
+            if (spellProcEvent->spellFamilyName && (!spellClassOptions && spellProcEvent->spellFamilyName != SPELLFAMILY_GENERIC || spellProcEvent->spellFamilyName != spellClassOptions->SpellFamilyName))
                 return false;
         }
     }
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index b8ee69827..c53e3977e 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12639"
+ #define REVISION_NR "12640"
 #endif // __REVISION_NR_H__