diff --git a/cura/Machines/Models/MaterialManagementModel.py b/cura/Machines/Models/MaterialManagementModel.py
index 0f37d2e3e7..f00b81e987 100644
--- a/cura/Machines/Models/MaterialManagementModel.py
+++ b/cura/Machines/Models/MaterialManagementModel.py
@@ -156,6 +156,8 @@ class MaterialManagementModel(QObject):
         new_containers = sorted(new_containers, key = lambda x: x.getId(), reverse = True)
 
         # Optimization. Serving the same purpose as the postponeSignals() in removeMaterial()
+        # postpone the signals emitted when duplicating materials. This is easier on the event loop; changes the
+        # behavior to be like a transaction. Prevents concurrency issues.
         with postponeSignals(container_registry.containerAdded, compress=CompressTechnique.CompressPerParameterValue):
             for container_to_add in new_containers:
                 container_to_add.setDirty(True)
diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py
index 1d30b1753e..d5a35d8eab 100644
--- a/cura/Machines/Models/QualityManagementModel.py
+++ b/cura/Machines/Models/QualityManagementModel.py
@@ -54,6 +54,10 @@ class QualityManagementModel(ListModel):
         self._extruder_manager = application.getExtruderManager()
 
         self._machine_manager.globalContainerChanged.connect(self._update)
+        self._machine_manager.activeQualityGroupChanged.connect(self._update)
+        self._machine_manager.activeStackChanged.connect(self._update)
+        self._machine_manager.extruderChanged.connect(self._update)
+
         container_registry.containerAdded.connect(self._qualityChangesListChanged)
         container_registry.containerRemoved.connect(self._qualityChangesListChanged)
         container_registry.containerMetaDataChanged.connect(self._qualityChangesListChanged)
diff --git a/cura/Settings/IntentManager.py b/cura/Settings/IntentManager.py
index 9f9d174ffa..c1d59fb84a 100644
--- a/cura/Settings/IntentManager.py
+++ b/cura/Settings/IntentManager.py
@@ -78,6 +78,8 @@ class IntentManager(QObject):
         final_intent_ids = set()  # type: Set[str]
         current_definition_id = global_stack.definition.getId()
         for extruder_stack in global_stack.extruderList:
+            if not extruder_stack.isEnabled:
+                continue
             nozzle_name = extruder_stack.variant.getMetaDataEntry("name")
             material_id = extruder_stack.material.getMetaDataEntry("base_file")
             final_intent_ids |= {metadata["id"] for metadata in self.intentMetadatas(current_definition_id, nozzle_name, material_id) if metadata.get("quality_type") in available_quality_types}
@@ -104,6 +106,8 @@ class IntentManager(QObject):
         current_definition_id = global_stack.definition.getId()
         final_intent_categories = set()  # type: Set[str]
         for extruder_stack in global_stack.extruderList:
+            if not extruder_stack.isEnabled:
+                continue
             nozzle_name = extruder_stack.variant.getMetaDataEntry("name")
             material_id = extruder_stack.material.getMetaDataEntry("base_file")
             final_intent_categories.update(self.intentCategories(current_definition_id, nozzle_name, material_id))