diff --git a/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
index 5a8fcda907..5a4ca95670 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Source/ActorInstance.cpp
@@ -1115,7 +1115,7 @@ namespace EMotionFX
     void ActorInstance::EnableAllNodes()
     {
         m_enabledNodes.resize(m_actor->GetNumNodes());
-        std::iota(m_enabledNodes.begin(), m_enabledNodes.end(), 0);
+        std::iota(m_enabledNodes.begin(), m_enabledNodes.end(), uint16(0));
     }
 
     // disable all nodes
diff --git a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp
index 6e68a761de..a6733ee614 100644
--- a/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp
+++ b/Gems/EMotionFX/Code/EMotionFX/Tools/EMotionStudio/Plugins/StandardPlugins/Source/AnimGraph/AnimGraphModel.cpp
@@ -562,9 +562,9 @@ namespace EMStudio
 
         ModelItemData modelItemData(graphInstance, animGraphObject);
         AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData);
-        for (ModelItemDataSet::const_iterator it = itModelItemData.first; it != itModelItemData.second; ++it)
+        if (itModelItemData.first != itModelItemData.second)
         {
-            ModelItemData* modelItemData2 = *it;
+            ModelItemData* modelItemData2 = *itModelItemData.first;
             return createIndex(modelItemData2->m_row, 0, modelItemData2);
         }
         return QModelIndex();
@@ -590,9 +590,9 @@ namespace EMStudio
                 // Find the model index
                 ModelItemData modelItemData(animGraphInstance, animGraphObject);
                 AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData);
-                for (ModelItemDataSet::const_iterator it = itModelItemData.first; it != itModelItemData.second; ++it)
+                if (itModelItemData.first != itModelItemData.second)
                 {
-                    ModelItemData* modelItemData2 = *it;
+                    ModelItemData* modelItemData2 = *itModelItemData.first;
                     return createIndex(modelItemData2->m_row, 0, modelItemData2);
                 }
             }
@@ -603,9 +603,9 @@ namespace EMStudio
             // Find the model index
             ModelItemData modelItemData(nullptr, animGraphObject);
             AZStd::pair<ModelItemDataSet::const_iterator, ModelItemDataSet::const_iterator> itModelItemData = m_modelItemDataSet.equal_range(&modelItemData);
-            for (ModelItemDataSet::const_iterator it = itModelItemData.first; it != itModelItemData.second; ++it)
+            if (itModelItemData.first != itModelItemData.second)
             {
-                ModelItemData* modelItemData2 = *it;
+                ModelItemData* modelItemData2 = *itModelItemData.first;
                 return createIndex(modelItemData2->m_row, 0, modelItemData2);
             }
         }
diff --git a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp
index e8c4ee69d8..a93ec07477 100644
--- a/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp
+++ b/Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/PropertyTypes.cpp
@@ -89,8 +89,9 @@ namespace EMotionFX
             AzToolsFramework::PropertyTypeRegistrationMessages::Bus::Broadcast(&AzToolsFramework::PropertyTypeRegistrationMessages::RegisterPropertyType, handler);
         }
         return propertyHandlers;
-#endif
+#else
         return AZStd::vector<AzToolsFramework::PropertyHandlerBase*> {};
+#endif
     }