diff --git a/asahi-diagnose b/asahi-diagnose
index 3492d3b..cb7045d 100755
--- a/asahi-diagnose
+++ b/asahi-diagnose
@@ -19,7 +19,7 @@ banner() {
 
     Collected at:   $(date) ($(date -Iseconds))
     Username:       $(whoami)
-    Hostname:       $(hostname)
+    Hostname:       $(hostnamectl hostname)
 
 EOF
 }
diff --git a/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh b/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh
index a53d2f1..12be260 100755
--- a/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh
+++ b/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh
@@ -45,3 +45,4 @@ fi
 
 ( cd /; cpio --quiet -i < "$VENDORFW/firmware.cpio" )
 info ":: Asahi firmware unpacked successfully"
+umount /run/.system-efi
diff --git a/update-m1n1 b/update-m1n1
index 841b0af..5267d2b 100755
--- a/update-m1n1
+++ b/update-m1n1
@@ -5,6 +5,8 @@ set -e
 
 [ -e /etc/default/update-m1n1 ] && . /etc/default/update-m1n1
 
+[ -n $M1N1_UPDATE_DISABLED ] && exit 0
+
 if [ -e "$(dirname "$0")"/functions.sh ]; then
     . "$(dirname "$0")"/functions.sh
 else