diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
index 52ecfd03ad..ad83aa2a24 100644
--- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
+++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
@@ -159,19 +159,20 @@ class PauseAtHeight(Script):
                 # Count nbr of negative layers (raft)
                 elif ";LAYER:-" in line:
                     nbr_negative_layers += 1
-                if not layers_started:
-                    continue
 
                 #Track the latest printing temperature in order to resume at the correct temperature.
                 if line.startswith("T"):
-                    current_t = self.getValue(line, "T")
+                    current_t = int(self.getValue(line, "T"))
                 m = self.getValue(line, "M")
-                if m is not None and (m == 104 or m == 109) and self.getValue(line, "S") is not None:
+                if m is not None and (int(m) == 104 or int(m) == 109) and self.getValue(line, "S") is not None:
                     extruder = current_t
                     if self.getValue(line, "T") is not None:
-                        extruder = self.getValue(line, "T")
+                        extruder = int(self.getValue(line, "T"))
                     target_temperature[extruder] = self.getValue(line, "S")
 
+                if not layers_started:
+                    continue
+
                 # If a Z instruction is in the line, read the current Z
                 if self.getValue(line, "Z") is not None:
                     current_z = self.getValue(line, "Z")
diff --git a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
index f4d6bf5458..2b4cd838bf 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDetailList.qml
@@ -14,6 +14,7 @@ Item
         frameVisible: false
         anchors.fill: detailList
         style: UM.Theme.styles.scrollview
+        flickableItem.flickableDirection: Flickable.VerticalFlick
         Column
         {
             anchors
diff --git a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
index 3f9173c69b..d52bd48d39 100644
--- a/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxDownloadsPage.qml
@@ -12,6 +12,7 @@ ScrollView
     width: parent.width
     height: parent.height
     style: UM.Theme.styles.scrollview
+    flickableItem.flickableDirection: Flickable.VerticalFlick
     Column
     {
         width: parent.width - 2 * padding
diff --git a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
index 9d916182f6..939cf0b505 100644
--- a/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
+++ b/plugins/Toolbox/resources/qml/ToolboxInstalledPage.qml
@@ -15,6 +15,7 @@ ScrollView
     width: parent.width
     height: parent.height
     style: UM.Theme.styles.scrollview
+    flickableItem.flickableDirection: Flickable.VerticalFlick
     Column
     {
         spacing: UM.Theme.getSize("default_margin").height
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index 80c2d27d9e..692a6fc259 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -20,6 +20,8 @@ UM.MainWindow
     viewportRect: Qt.rect(0, 0, (base.width - sidebar.width) / base.width, 1.0)
     property bool showPrintMonitor: false
 
+    backgroundColor: UM.Theme.getColor("viewport_background")
+
     // This connection is here to support legacy printer output devices that use the showPrintMonitor signal on Application to switch to the monitor stage
     // It should be phased out in newer plugin versions.
     Connections
diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml
index 5e3c4f700b..5f60b23477 100644
--- a/resources/qml/Preferences/GeneralPage.qml
+++ b/resources/qml/Preferences/GeneralPage.qml
@@ -570,7 +570,7 @@ UM.PreferencesPage
 
                             Component.onCompleted:
                             {
-                                append({ text: catalog.i18nc("@option:openProject", "Always ask"), code: "always_ask" })
+                                append({ text: catalog.i18nc("@option:openProject", "Always ask me this"), code: "always_ask" })
                                 append({ text: catalog.i18nc("@option:openProject", "Always open as a project"), code: "open_as_project" })
                                 append({ text: catalog.i18nc("@option:openProject", "Always import models"), code: "open_as_model" })
                             }
@@ -617,7 +617,12 @@ UM.PreferencesPage
                     Label
                     {
                         font.bold: true
-                        text: catalog.i18nc("@label", "Override Profile")
+                        text: catalog.i18nc("@label", "Profiles")
+                    }
+
+                    Label
+                    {
+                        text: catalog.i18nc("@window:text", "Default behavior for changed setting values when switching to a different profile: ")
                     }
 
                     ComboBox
@@ -632,8 +637,8 @@ UM.PreferencesPage
                             Component.onCompleted:
                             {
                                 append({ text: catalog.i18nc("@option:discardOrKeep", "Always ask me this"), code: "always_ask" })
-                                append({ text: catalog.i18nc("@option:discardOrKeep", "Discard and never ask again"), code: "always_discard" })
-                                append({ text: catalog.i18nc("@option:discardOrKeep", "Keep and never ask again"), code: "always_keep" })
+                                append({ text: catalog.i18nc("@option:discardOrKeep", "Always discard changed settings"), code: "always_discard" })
+                                append({ text: catalog.i18nc("@option:discardOrKeep", "Always transfer changed settings to new profile"), code: "always_keep" })
                             }
                         }