diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml
index adb263abdd..6cecbbc83b 100644
--- a/.github/workflows/cura-installer.yml
+++ b/.github/workflows/cura-installer.yml
@@ -158,12 +158,16 @@ jobs:
                 run: |
                     . ./cura_inst/bin/activate_github_actions_env.sh
                     . ./cura_inst/bin/activate_github_actions_version_env.sh
+                    echo "CURA_VERSION_FULL=5.1.0-beta" >> $GITHUB_ENV
+                    echo "CURA_VERSION_BUILD=0" >> $GITHUB_ENV
 
             -   name: Set Environment variables for Cura (Powershell)
                 if: ${{ runner.os == 'Windows' }}
                 run: |
                     .\cura_inst\Scripts\activate_github_actions_env.ps1
                     .\cura_inst\Scripts\activate_github_actions_version_env.ps1
+                    echo "Env:CURA_VERSION_FULL=5.1.0-beta" >> $Env:GITHUB_ENV
+                    echo "Env:CURA_VERSION_BUILD=0" >> $Env:GITHUB_ENV
 
             -   name: Create the Cura dist
                 run: pyinstaller ./cura_inst/Ultimaker-Cura.spec
diff --git a/resources/definitions/alfawise_u30.def.json b/resources/definitions/alfawise_u30.def.json
index 3bfc1aaa4e..b76a1773c5 100644
--- a/resources/definitions/alfawise_u30.def.json
+++ b/resources/definitions/alfawise_u30.def.json
@@ -40,6 +40,7 @@
         "machine_max_feedrate_y": { "default_value": 200 },
         "machine_max_feedrate_z": { "default_value": 5 },
         "machine_max_feedrate_e": { "default_value": 100 },
+        "speed_z_hop": { "value": "machine_max_feedrate_z" },
         "machine_max_acceleration_x": { "default_value": 500 },
         "machine_max_acceleration_y": { "default_value": 500 },
         "machine_max_acceleration_z": { "default_value": 10 },
diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml
index d22e5a1526..2ec342f502 100644
--- a/resources/qml/Cura.qml
+++ b/resources/qml/Cura.qml
@@ -311,8 +311,6 @@ UM.MainWindow
                 property int mouseY: base.mouseY
                 property bool tallerThanParent: height > parent.height
 
-                z: 1 // Ensure toolbar and toolpanels are drawn on top
-
                 anchors
                 {
                     verticalCenter: tallerThanParent ? undefined : parent.verticalCenter