diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h
index f74b971512..5786cc3fbc 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/EditorEntityManager.h
@@ -17,7 +17,7 @@ namespace AzToolsFramework
         : public EditorEntityAPI
     {
     public:
-        ~EditorEntityManager();
+        virtual ~EditorEntityManager();
 
         void Start();
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
index 6e55d9f97c..139bbb563c 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
@@ -97,6 +97,7 @@ namespace AzToolsFramework::AssetUtils
     struct EnabledPlatformsVisitor
         : AZ::SettingsRegistryInterface::Visitor
     {
+        using AZ::SettingsRegistryInterface::Visitor::Visit;
         void Visit(AZStd::string_view path, AZStd::string_view valueName, AZ::SettingsRegistryInterface::Type, AZStd::string_view value) override;
 
         AZStd::vector<AZStd::string> m_enabledPlatforms;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h
index ed36a4458e..85947f56f6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.h
@@ -34,7 +34,7 @@ namespace AzToolsFramework
 
         static PreemptiveUndoCache* Get();
         PreemptiveUndoCache();
-        ~PreemptiveUndoCache();
+        virtual ~PreemptiveUndoCache();
 
         void RegisterToUndoCacheInterface();
 
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h
index b5a8cf9e3a..43cb7f0d2d 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndoCache.h
@@ -32,6 +32,8 @@ namespace AzToolsFramework
         public:
             AZ_CLASS_ALLOCATOR(PrefabUndoCache, AZ::SystemAllocator, 0);
 
+            virtual ~PrefabUndoCache() = default;
+
             void Initialize();
             void Destroy();
 
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
index 9925d5bff3..e5ce22e13a 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
@@ -50,7 +50,7 @@ namespace Benchmark
         SetupPrefabSystem();
     }
 
-    void BM_Prefab::SetUp(::benchmark::State & state)
+    void BM_Prefab::internalSetUp(const benchmark::State& state)
     {
         AZ::Debug::TraceMessageBus::Handler::BusConnect();
 
@@ -59,7 +59,7 @@ namespace Benchmark
         SetupPrefabSystem();
     }
 
-    void BM_Prefab::TearDown(::benchmark::State & state)
+    void BM_Prefab::internalTearDown(const benchmark::State& state)
     {
         m_paths = {};
 
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h
index a55d5c7789..bd4b20cd77 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.h
@@ -24,12 +24,27 @@ namespace Benchmark
         : public UnitTest::AllocatorsBenchmarkFixture
         , public UnitTest::TraceBusRedirector
     {
-    protected:
-        using ::benchmark::Fixture::SetUp;
-        using ::benchmark::Fixture::TearDown;
+        void internalSetUp(const benchmark::State& state);
+        void internalTearDown(const benchmark::State& state);
 
-        void SetUp(::benchmark::State& state) override;
-        void TearDown(::benchmark::State& state) override;
+    protected:
+        void SetUp(const benchmark::State& state) override
+        {
+            internalSetUp(state);
+        }
+        void SetUp(benchmark::State& state) override
+        {
+            internalSetUp(state);
+        }
+
+        void TearDown(const benchmark::State& state) override
+        {
+            internalTearDown(state);
+        }
+        void TearDown(benchmark::State& state) override
+        {
+            internalTearDown(state);
+        }
 
         AZ::Entity* CreateEntity(
             const char* entityName,