diff --git a/ElunaIncludes.h b/ElunaIncludes.h
index 2181ede..d433181 100644
--- a/ElunaIncludes.h
+++ b/ElunaIncludes.h
@@ -102,6 +102,7 @@ typedef Opcodes                 OpcodesList;
 #define eObjectMgr              (sObjectMgr)
 #define eAccountMgr             (sAccountMgr)
 #define eAuctionMgr             (sAuctionMgr)
+#define eGameEventMgr           (sGameEventMgr)
 #define eObjectAccessor()       ObjectAccessor::
 #define REGEN_TIME_FULL
 
diff --git a/PlayerMethods.h b/PlayerMethods.h
index 4051c27..93a997c 100644
--- a/PlayerMethods.h
+++ b/PlayerMethods.h
@@ -2896,13 +2896,13 @@ namespace LuaPlayer
 
 #ifdef TRINITY
         // check item starting quest (it can work incorrectly if added without item in inventory)
-        ItemTemplateContainer const* itc = sObjectMgr->GetItemTemplateStore();
-        ItemTemplateContainer::const_iterator result = std::find_if(itc->begin(), itc->end(), [quest](ItemTemplateContainer::value_type const& value)
+        ItemTemplateContainer const& itc = sObjectMgr->GetItemTemplateStore();
+        auto itr = std::find_if(std::begin(itc), std::end(itc), [quest](ItemTemplateContainer::value_type const& value)
         {
             return value.second.StartQuest == quest->GetQuestId();
         });
 
-        if (result != itc->end())
+        if (itr != std::end(itc))
             return 0;
 
         // ok, normal (creature/GO starting) quest