diff --git a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
index 3c5ff0eab8..fac2867074 100644
--- a/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
+++ b/Code/Framework/AzCore/AzCore/Component/ComponentApplication.h
@@ -206,8 +206,8 @@ namespace AZ
         void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler& handler) override final;
         void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler& handler) override final;
         void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler& handler) override final;
-        void SignalEntityActivated(AZ::Entity* entity) override final;
-        void SignalEntityDeactivated(AZ::Entity* entity) override final;
+        void SignalEntityActivated(Entity* entity) override final;
+        void SignalEntityDeactivated(Entity* entity) override final;
         bool AddEntity(Entity* entity) override;
         bool RemoveEntity(Entity* entity) override;
         bool DeleteEntity(const EntityId& id) override;
diff --git a/Code/Framework/AzCore/Tests/BehaviorContextFixture.h b/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
index 0e2b67addd..6ae97e1304 100644
--- a/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
+++ b/Code/Framework/AzCore/Tests/BehaviorContextFixture.h
@@ -52,10 +52,10 @@ namespace UnitTest
         void UnregisterComponentDescriptor(const AZ::ComponentDescriptor*) override {}
         void RegisterEntityAddedEventHandler(AZ::EntityAddedEvent::Handler&) override {}
         void RegisterEntityRemovedEventHandler(AZ::EntityRemovedEvent::Handler&) override {}
-        void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override {}
-        void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override {}
-        void SignalEntityActivated(AZ::Entity* entity) override {}
-        void SignalEntityDeactivated(AZ::Entity* entity) override {}
+        void RegisterEntityActivatedEventHandler(AZ::EntityActivatedEvent::Handler&) override {}
+        void RegisterEntityDeactivatedEventHandler(AZ::EntityDeactivatedEvent::Handler&) override {}
+        void SignalEntityActivated(AZ::Entity*) override {}
+        void SignalEntityDeactivated(AZ::Entity*) override {}
         bool AddEntity(AZ::Entity*) override { return true; }
         bool RemoveEntity(AZ::Entity*) override { return true; }
         bool DeleteEntity(const AZ::EntityId&) override { return true; }
diff --git a/Code/Framework/AzCore/Tests/Serialization.cpp b/Code/Framework/AzCore/Tests/Serialization.cpp
index c1ce9f3d03..036942f9dd 100644
--- a/Code/Framework/AzCore/Tests/Serialization.cpp
+++ b/Code/Framework/AzCore/Tests/Serialization.cpp
@@ -1234,8 +1234,8 @@ namespace UnitTest
         void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler&) override { }
         void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
         void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
-        void SignalEntityActivated(AZ::Entity* entity) override { }
-        void SignalEntityDeactivated(AZ::Entity* entity) override { }
+        void SignalEntityActivated(Entity*) override { }
+        void SignalEntityDeactivated(Entity*) override { }
         bool AddEntity(Entity*) override { return false; }
         bool RemoveEntity(Entity*) override { return false; }
         bool DeleteEntity(const EntityId&) override { return false; }
diff --git a/Code/Framework/Tests/ComponentAddRemove.cpp b/Code/Framework/Tests/ComponentAddRemove.cpp
index 3815188269..4fd6db7dde 100644
--- a/Code/Framework/Tests/ComponentAddRemove.cpp
+++ b/Code/Framework/Tests/ComponentAddRemove.cpp
@@ -1102,8 +1102,8 @@ namespace UnitTest
         void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler&) override {}
         void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override {}
         void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override {}
-        void SignalEntityActivated(AZ::Entity* entity) override {}
-        void SignalEntityDeactivated(AZ::Entity* entity) override {}
+        void SignalEntityActivated(Entity*) override {}
+        void SignalEntityDeactivated(Entity*) override {}
         bool AddEntity(Entity*) override { return true; }
         bool RemoveEntity(Entity*) override { return true; }
         bool DeleteEntity(const EntityId&) override { return true; }
diff --git a/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
index dc746bae23..e40edcc864 100644
--- a/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
+++ b/Gems/AWSClientAuth/Code/Tests/AWSClientAuthGemMock.h
@@ -577,10 +577,10 @@ namespace AWSClientAuthUnitTest
         void UnregisterComponentDescriptor(const AZ::ComponentDescriptor*) override { }
         void RegisterEntityAddedEventHandler(AZ::EntityAddedEvent::Handler&) override { }
         void RegisterEntityRemovedEventHandler(AZ::EntityRemovedEvent::Handler&) override { }
-        void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
-        void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
-        void SignalEntityActivated(AZ::Entity* entity) override { }
-        void SignalEntityDeactivated(AZ::Entity* entity) override { }
+        void RegisterEntityActivatedEventHandler(AZ::EntityActivatedEvent::Handler&) override { }
+        void RegisterEntityDeactivatedEventHandler(AZ::EntityDeactivatedEvent::Handler&) override { }
+        void SignalEntityActivated(AZ::Entity*) override { }
+        void SignalEntityDeactivated(AZ::Entity*) override { }
         bool AddEntity(AZ::Entity*) override { return true; }
         bool RemoveEntity(AZ::Entity*) override { return true; }
         bool DeleteEntity(const AZ::EntityId&) override { return true; }
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
index 2a26c2a0ae..c94978c63d 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
@@ -107,8 +107,8 @@ namespace UnitTest
         void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler&) override { }
         void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
         void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
-        void SignalEntityActivated(AZ::Entity* entity) override { }
-        void SignalEntityDeactivated(AZ::Entity* entity) override { }
+        void SignalEntityActivated(Entity*) override { }
+        void SignalEntityDeactivated(Entity*) override { }
         bool AddEntity(Entity*) override { return false; }
         bool RemoveEntity(Entity*) override { return false; }
         bool DeleteEntity(const EntityId&) override { return false; }
diff --git a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
index fbc39f6a40..81d9ddb87a 100644
--- a/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests.Builders/BuilderTestFixture.h
@@ -41,10 +41,10 @@ namespace UnitTest
         void UnregisterComponentDescriptor(const AZ::ComponentDescriptor*) override { }
         void RegisterEntityAddedEventHandler(AZ::EntityAddedEvent::Handler&) override { }
         void RegisterEntityRemovedEventHandler(AZ::EntityRemovedEvent::Handler&) override { }
-        void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
-        void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
-        void SignalEntityActivated(AZ::Entity* entity) override { }
-        void SignalEntityDeactivated(AZ::Entity* entity) override { }
+        void RegisterEntityActivatedEventHandler(AZ::EntityActivatedEvent::Handler&) override { }
+        void RegisterEntityDeactivatedEventHandler(AZ::EntityDeactivatedEvent::Handler&) override { }
+        void SignalEntityActivated(AZ::Entity*) override { }
+        void SignalEntityDeactivated(AZ::Entity*) override { }
         bool AddEntity(AZ::Entity*) override { return false; }
         bool RemoveEntity(AZ::Entity*) override { return false; }
         bool DeleteEntity(const AZ::EntityId&) override { return false; }
diff --git a/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
index 55a226956a..9ab6aea51a 100644
--- a/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
+++ b/Gems/Atom/RPI/Code/Tests/Common/AssetManagerTestFixture.h
@@ -38,10 +38,10 @@ namespace UnitTest
         void UnregisterComponentDescriptor(const AZ::ComponentDescriptor*) override { }
         void RegisterEntityAddedEventHandler(AZ::EntityAddedEvent::Handler&) override { }
         void RegisterEntityRemovedEventHandler(AZ::EntityRemovedEvent::Handler&) override { }
-        void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
-        void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
-        void SignalEntityActivated(AZ::Entity* entity) override { }
-        void SignalEntityDeactivated(AZ::Entity* entity) override { }
+        void RegisterEntityActivatedEventHandler(AZ::EntityActivatedEvent::Handler&) override { }
+        void RegisterEntityDeactivatedEventHandler(AZ::EntityDeactivatedEvent::Handler&) override { }
+        void SignalEntityActivated(AZ::Entity*) override { }
+        void SignalEntityDeactivated(AZ::Entity*) override { }
         bool AddEntity(AZ::Entity*) override { return false; }
         bool RemoveEntity(AZ::Entity*) override { return false; }
         bool DeleteEntity(const AZ::EntityId&) override { return false; }
diff --git a/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp b/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
index 27cc326ff9..2514485519 100644
--- a/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
+++ b/Gems/LmbrCentral/Code/Tests/Builders/SliceBuilderTests.cpp
@@ -306,8 +306,8 @@ public:
     void RegisterEntityRemovedEventHandler(EntityRemovedEvent::Handler&) override { }
     void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
     void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
-    void SignalEntityActivated(AZ::Entity* entity) override { }
-    void SignalEntityDeactivated(AZ::Entity* entity) override { }
+    void SignalEntityActivated(Entity*) override { }
+    void SignalEntityDeactivated(Entity*) override { }
     bool AddEntity(Entity*) override { return true; }
     bool RemoveEntity(Entity*) override { return true; }
     bool DeleteEntity(const AZ::EntityId&) override { return true; }
diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
index 71aa361793..e6fb77eca7 100644
--- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
+++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp
@@ -9,7 +9,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  *
  */
-#pragma optimize("", off)
+
 #include <Source/MultiplayerSystemComponent.h>
 #include <Source/Components/MultiplayerComponent.h>
 #include <Source/AutoGen/AutoComponentTypes.h>
diff --git a/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp b/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp
index 698376dccf..726c75ad86 100644
--- a/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp
+++ b/Gems/Multiplayer/Code/Source/ReplicationWindows/NullReplicationWindow.cpp
@@ -10,7 +10,7 @@
 *
 */
 
-#include "NullReplicationWindow.h"
+#include <Source/ReplicationWindows/NullReplicationWindow.h>
 
 namespace Multiplayer
 {
diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
index 8545424ca7..32437ae22a 100644
--- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
+++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp
@@ -82,10 +82,10 @@ protected:
     void UnregisterComponentDescriptor(const AZ::ComponentDescriptor*) override { }
     void RegisterEntityAddedEventHandler(AZ::EntityAddedEvent::Handler&) override { }
     void RegisterEntityRemovedEventHandler(AZ::EntityRemovedEvent::Handler&) override { }
-    void RegisterEntityActivatedEventHandler(EntityActivatedEvent::Handler&) override { }
-    void RegisterEntityDeactivatedEventHandler(EntityDeactivatedEvent::Handler&) override { }
-    void SignalEntityActivated(AZ::Entity* entity) override { }
-    void SignalEntityDeactivated(AZ::Entity* entity) override { }
+    void RegisterEntityActivatedEventHandler(AZ::EntityActivatedEvent::Handler&) override { }
+    void RegisterEntityDeactivatedEventHandler(AZ::EntityDeactivatedEvent::Handler&) override { }
+    void SignalEntityActivated(AZ::Entity*) override { }
+    void SignalEntityDeactivated(AZ::Entity*) override { }
     bool AddEntity(AZ::Entity*) override { return true; }
     bool RemoveEntity(AZ::Entity*) override { return true; }
     bool DeleteEntity(const AZ::EntityId&) override { return true; }