diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel
index 82be334bc78fc7eb67cbddfbf1f906f5bd6640a7..d112876944939b4132189de69bfca7a4b9faea38 100755
--- a/src/freedombone-controlpanel
+++ b/src/freedombone-controlpanel
@@ -1369,7 +1369,7 @@ function shut_down_system {
         1) return;;
         255) return;;
     esac
-    shutdown now
+    systemctl poweroff
 }
 
 function restart_system {
diff --git a/src/freedombone-utils-final b/src/freedombone-utils-final
index ddd17ae19ce703020d3ed4686ed3d658d7d0568e..8b30da4a61a201bbac206f00bf6cd122f45b6d57 100755
--- a/src/freedombone-utils-final
+++ b/src/freedombone-utils-final
@@ -73,7 +73,7 @@ $(get_ssh_server_key)
             echo $'Shutting down the system. Detatch the ethernet cable, attach wifi dongle, then power on again.'
             echo ''
             ${PROJECT_NAME}-logging off
-            shutdown now
+            systemctl poweroff
             return
         fi
         echo $'Turning off logging'
diff --git a/src/freedombone-utils-wifi b/src/freedombone-utils-wifi
index b46e8b5bec83ce1d9476e10643fb2e2b809103fc..3b84ecff2bac5650bec70b4a385b2aa263305fdb 100755
--- a/src/freedombone-utils-wifi
+++ b/src/freedombone-utils-wifi
@@ -41,6 +41,7 @@ ATHEROS_WIFI_REPO="https://github.com/qca/open-ath9k-htc-firmware.git"
 
 # Debian stretch has a problem where the formerly predictable wlan0 and eth0
 # device names get assigned random names. This is a hacky workaround.
+# Also adding net.ifnames=0 to kernel options on bootloader may work.
 function enable_predictable_device_names {
     if [ $rootdir ]; then
         chroot "$rootdir" ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules