diff --git a/cura/Machines/MaterialManager.py b/cura/Machines/MaterialManager.py
index e357a3fbe1..8b74596667 100644
--- a/cura/Machines/MaterialManager.py
+++ b/cura/Machines/MaterialManager.py
@@ -160,11 +160,11 @@ class MaterialManager(QObject):
                 key_data.append(root_material_metadata.get(key))
             key_data = tuple(key_data)
 
-            # If the key_data doesn't exist, no matter if the material is read only...
+            # If the key_data doesn't exist, it doesn't matter if the material is read only...
             if key_data not in material_group_dict:
                 material_group_dict[key_data] = dict()
             else:
-                # ...but if key_data exists, we just overrite it if the material is read only, otherwise we skip it
+                # ...but if key_data exists, we just overwrite it if the material is read only, otherwise we skip it
                 if not machine_node.is_read_only:
                     continue
             approximate_diameter = root_material_metadata.get("approximate_diameter")
diff --git a/cura/PreviewPass.py b/cura/PreviewPass.py
index f6b963d141..4241a2f243 100644
--- a/cura/PreviewPass.py
+++ b/cura/PreviewPass.py
@@ -1,7 +1,6 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 from UM.Application import Application
-from UM.Math.Color import Color
 from UM.Resources import Resources
 
 from UM.View.RenderPass import RenderPass
@@ -74,7 +73,6 @@ class PreviewPass(RenderPass):
 
         # Create batches to be rendered
         batch = RenderBatch(self._shader)
-        batch_non_printing = RenderBatch(self._non_printing_shader, type = RenderBatch.RenderType.Transparent)
         batch_support_mesh = RenderBatch(self._support_mesh_shader)
 
         # Fill up the batch with objects that can be sliced. `
@@ -83,7 +81,7 @@ class PreviewPass(RenderPass):
                 per_mesh_stack = node.callDecoration("getStack")
                 if node.callDecoration("isNonPrintingMesh"):
                     # Non printing mesh
-                    batch_non_printing.addItem(node.getWorldTransformation(), node.getMeshData(), uniforms = {})
+                    continue
                 elif per_mesh_stack is not None and per_mesh_stack.getProperty("support_mesh", "value") == True:
                     # Support mesh
                     uniforms = {}
@@ -112,7 +110,6 @@ class PreviewPass(RenderPass):
 
         batch.render(render_camera)
         batch_support_mesh.render(render_camera)
-        batch_non_printing.render(render_camera)
 
         self.release()
 
diff --git a/cura/Snapshot.py b/cura/Snapshot.py
index 1f2a24aecd..d1bfeea40f 100644
--- a/cura/Snapshot.py
+++ b/cura/Snapshot.py
@@ -6,13 +6,10 @@ from PyQt5 import QtCore
 from PyQt5.QtGui import QImage
 
 from cura.PreviewPass import PreviewPass
-from cura.Scene import ConvexHullNode
 
 from UM.Application import Application
-from UM.Math.AxisAlignedBox import AxisAlignedBox
 from UM.Math.Matrix import Matrix
 from UM.Math.Vector import Vector
-from UM.Mesh.MeshData import transformVertices
 from UM.Scene.Camera import Camera
 from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
 
@@ -51,7 +48,7 @@ class Snapshot:
         # determine zoom and look at
         bbox = None
         for node in DepthFirstIterator(root):
-            if node.callDecoration("isSliceable") and node.getMeshData() and node.isVisible():
+            if node.callDecoration("isSliceable") and node.getMeshData() and node.isVisible() and not node.callDecoration("isNonPrintingMesh"):
                 if bbox is None:
                     bbox = node.getBoundingBox()
                 else:
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
index 5b9697eda2..e1ffc6326c 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsGrid.qml
@@ -15,7 +15,7 @@ Column
     Label
     {
         id: heading
-        text: toolbox.viewCategory == "material" ? catalog.i18nc("@label", "Maker Choices") : catalog.i18nc("@label", "Community Plugins")
+        text: toolbox.viewCategory == "material" ? catalog.i18nc("@label", "Community contributions") : catalog.i18nc("@label", "Community plugins")
         width: parent.width
         color: UM.Theme.getColor("text_medium")
         font: UM.Theme.getFont("medium")
diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
index 72c956b8d7..1cf2074979 100644
--- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
+++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
@@ -354,12 +354,10 @@ Cura.MachineAction
         onShowDialog:
         {
             printerKey = key;
-
             addressText = address;
+            manualPrinterDialog.show();
             addressField.selectAll();
             addressField.focus = true;
-
-            manualPrinterDialog.show();
         }
 
         onAccepted: