diff --git a/Source/Game/Conditions/ConditionManager.cs b/Source/Game/Conditions/ConditionManager.cs
index cd8df26cc..90ce36d1f 100644
--- a/Source/Game/Conditions/ConditionManager.cs
+++ b/Source/Game/Conditions/ConditionManager.cs
@@ -509,7 +509,7 @@ namespace Game
                             valid = AddToPhases(cond);
                             break;
                         case ConditionSourceType.AreaTrigger:
-                            areaTriggerConditionContainerStorage.Add(Tuple.Create((int)cond.SourceGroup, cond.SourceEntry != 0), cond);
+                            areaTriggerConditionContainerStorage.Add(Tuple.Create(cond.SourceGroup, cond.SourceEntry != 0), cond);
                             ++count;
                             continue;
                         default:
@@ -2426,7 +2426,7 @@ namespace Game
         Dictionary<uint, MultiMap<uint, Condition>> spellClickEventConditionStorage = new();
         Dictionary<uint, MultiMap<uint, Condition>> npcVendorConditionContainerStorage = new();
         Dictionary<Tuple<int, uint>, MultiMap<uint, Condition>> smartEventConditionStorage = new();
-        MultiMap<Tuple<int, bool>, Condition> areaTriggerConditionContainerStorage = new();
+        MultiMap<Tuple<uint, bool>, Condition> areaTriggerConditionContainerStorage = new();
 
         public string[] StaticSourceTypeData =
         {
diff --git a/Source/Game/Scripting/ScriptManager.cs b/Source/Game/Scripting/ScriptManager.cs
index df605e78e..e8d46f5f0 100644
--- a/Source/Game/Scripting/ScriptManager.cs
+++ b/Source/Game/Scripting/ScriptManager.cs
@@ -163,6 +163,7 @@ namespace Game.Scripting
                             case "OnlyOnceAreaTriggerScript":
                             case "SceneScript":
                             case "QuestScript":
+                            case "ConversationScript":
                                 if (!attribute.Name.IsEmpty())
                                     name = attribute.Name;