diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
index 902354931a..2f9201ffa9 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/EMStudioSDK/Source/RenderPlugin/ManipulatorCallbacks.h
@@ -42,6 +42,7 @@ namespace EMStudio
         /**
          * update the actor instance.
          */
+        using MCommon::ManipulatorCallback::Update;
         void Update(const AZ::Vector3& value) override;
 
         /**
@@ -85,6 +86,7 @@ namespace EMStudio
         /**
          * update the actor instance.
          */
+        using MCommon::ManipulatorCallback::Update;
         void Update(const AZ::Quaternion& value) override;
 
         /**
@@ -125,6 +127,7 @@ namespace EMStudio
         /**
          * update the actor instance.
          */
+        using MCommon::ManipulatorCallback::Update;
         void Update(const AZ::Vector3& value) override;
 
         /**
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp
index 805ef16b7d..18727f67d2 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/RotationParameterEditor.cpp
@@ -142,6 +142,7 @@ namespace EMStudio
             , m_manipulatorCallback(manipulatorCallback)
         {}
 
+        using MCommon::ManipulatorCallback::Update;
         void Update(const AZ::Quaternion& value) override
         {
             // call the base class update function
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp
index cc97f9d979..7a24ece95a 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/ParameterEditor/Vector3GizmoParameterEditor.cpp
@@ -152,6 +152,7 @@ namespace EMStudio
             , m_manipulatorCallback(manipulatorCallback)
         {}
 
+        using MCommon::ManipulatorCallback::Update;
         void Update(const AZ::Vector3& value) override
         {
             // call the base class update function
diff --git a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h
index e04f19fa95..b2375180e6 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphInstance.h
@@ -11,6 +11,8 @@ namespace EMotionFX
     class AnimGraphInstance
     {
     public:
+        virtual ~AnimGraphInstance() = default;
+
         //void Output(Pose* outputPose);
         //void Start();
         //void Stop();
diff --git a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h
index 9c73694d2a..065be187c8 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/AnimGraphNode.h
@@ -14,6 +14,8 @@ namespace EMotionFX
     public:
         AZ_RTTI(AnimGraphNode, "{7F1C0E1D-4D32-4A6D-963C-20193EA28F95}", AnimGraphObject)
 
+        virtual ~AnimGraphNode() = default;
+
         MOCK_CONST_METHOD1(CollectOutgoingConnections, void(AZStd::vector<AZStd::pair<BlendTreeConnection*, AnimGraphNode*>>& outConnections));
         MOCK_CONST_METHOD2(CollectOutgoingConnections, void(AZStd::vector<AZStd::pair<BlendTreeConnection*, AnimGraphNode*>>& outConnections, const size_t portIndex));
 
diff --git a/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h b/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h
index 0146086f06..50a465f5da 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/CommandManager.h
@@ -11,7 +11,7 @@ namespace MCore
     class CommandManager
     {
     public:
-        //virtual ~CommandManager();
+        virtual ~CommandManager() = default;
 
         //bool ExecuteCommand(const char* command, AZStd::string& outCommandResult, bool addToHistory = true, Command** outExecutedCommand = nullptr, CommandLine* outExecutedParamters = nullptr, bool callFromCommandGroup = false, bool clearErrors = true, bool handleErrors = true);
         //bool ExecuteCommand(const AZStd::string& command, AZStd::string& outCommandResult, bool addToHistory = true, Command** outExecutedCommand = nullptr, CommandLine* outExecutedParamters = nullptr, bool callFromCommandGroup = false, bool clearErrors = true, bool handleErrors = true);
diff --git a/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h b/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h
index adef6392bb..b50e9bf8d5 100644
--- a/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h
+++ b/Gems/EMotionFX/Code/Tests/Mocks/CommandSystemCommandManager.h
@@ -12,6 +12,8 @@ namespace CommandSystem
         : public MCore::CommandManager
     {
     public:
+        virtual ~CommandManager() = default;
+
         MOCK_METHOD0(GetCurrentSelection, SelectionList&());
         MOCK_METHOD1(SetCurrentSelection, void(SelectionList& selection));
         MOCK_CONST_METHOD0(GetLockSelection, bool());