diff --git a/ElunaEventMgr.h b/ElunaEventMgr.h
index e27b45d..434e9c1 100644
--- a/ElunaEventMgr.h
+++ b/ElunaEventMgr.h
@@ -9,7 +9,11 @@
 
 #include "ElunaUtility.h"
 #include "Common.h"
+#ifdef TRINITY
 #include "Random.h"
+#else
+#include "Util.h"
+#endif
 #include <map>
 
 #ifdef TRINITY
diff --git a/PlayerMethods.h b/PlayerMethods.h
index c505367..9caf2ef 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -3606,7 +3606,9 @@ namespace LuaPlayer
         uint32 rank = Eluna::CHECKVAL<uint32>(L, 3);
 
         player->LearnTalent(id, rank);
+#if (!defined(TBC) && !defined(CLASSIC))
         player->SendTalentsInfoData(false);
+#endif
 
 #ifndef TRINITY
         // if player has a pet, update owner talent auras
diff --git a/UnitMethods.h b/UnitMethods.h
index 36acdd2..1b985eb 100644
--- a/UnitMethods.h
+++ b/UnitMethods.h
@@ -2776,10 +2776,11 @@ namespace LuaUnit
 #else
 #ifdef CMANGOS
         SpellEntry const* spellEntry = GetSpellStore()->LookupEntry<SpellEntry>(spell);
+        unit->AddThreat(victim, threat, false, spellEntry ? spellEntry->SchoolMask : SPELL_SCHOOL_MASK_NONE, spellEntry);
 #else
         SpellEntry const* spellEntry = sSpellStore.LookupEntry(spell);
+        unit->AddThreat(victim, threat, false, spellEntry ? GetSchoolMask(spellEntry->School) : SPELL_SCHOOL_MASK_NONE, spellEntry);
 #endif
-        unit->AddThreat(victim, threat, false, spellEntry ? spellEntry->SchoolMask : SPELL_SCHOOL_MASK_NONE, spellEntry);
 #endif
         return 0;
     }