From 57913d837854fafe4b47725266d62aaabc694f6e Mon Sep 17 00:00:00 2001
From: srikappa <srikappa@amazon.com>
Date: Thu, 27 May 2021 18:19:28 -0700
Subject: [PATCH] A couple of bug fixes

---
 .../AzToolsFramework/Prefab/PrefabPublicHandler.cpp         | 6 +++---
 .../AzToolsFramework/Prefab/PrefabSystemComponent.cpp       | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index 1b98711352..f6ded4ae45 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -1141,12 +1141,12 @@ namespace AzToolsFramework
 
                         CreateLink(*nestedInstancePtr, parentTemplateId, currentUndoBatch, AZStd::move(linkPatchesCopy), true);
                     });
-
-                    AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
-                        &AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
                 }
             }
 
+            AzToolsFramework::ToolsApplicationRequestBus::Broadcast(
+                &AzToolsFramework::ToolsApplicationRequestBus::Events::ClearDirtyEntities);
+
             if (createdUndo)
             {
                 ToolsApplicationRequestBus::Broadcast(&ToolsApplicationRequests::EndUndoBatch);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
index c4e6415b02..1d478ad581 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabSystemComponent.cpp
@@ -652,7 +652,8 @@ namespace AzToolsFramework
             if (instancesValue->get().FindMember(rapidjson::StringRef(instanceAlias.c_str())) == instancesValue->get().MemberEnd())
             {
                 instancesValue->get().AddMember(
-                    rapidjson::StringRef(instanceAlias.c_str()), PrefabDomValue(), targetTemplateDom.GetAllocator());
+                    rapidjson::Value(instanceAlias.c_str(), targetTemplateDom.GetAllocator()), PrefabDomValue(),
+                    targetTemplateDom.GetAllocator());
             }
 
             Template& sourceTemplate = sourceTemplateRef->get();