diff --git a/usr/lib/archboot/installer/autoconfiguration.sh b/usr/lib/archboot/installer/autoconfiguration.sh
index 89b69ce4f..312935aab 100644
--- a/usr/lib/archboot/installer/autoconfiguration.sh
+++ b/usr/lib/archboot/installer/autoconfiguration.sh
@@ -120,6 +120,7 @@ _auto_testing()
 {
     if rg -q '^\[core-testing' /etc/pacman.conf; then
         _progress "53"  "Enable [testing] repository on installed system..."
+        #shellcheck disable=SC2016
         sd '^#(\[[c,e].*-testing\]\n)#' '$1' "${_DESTDIR}"/etc/pacman.conf
         sleep 2
     fi
diff --git a/usr/lib/archboot/installer/blockdevices.sh b/usr/lib/archboot/installer/blockdevices.sh
index 88a1baa3f..eeba433e7 100644
--- a/usr/lib/archboot/installer/blockdevices.sh
+++ b/usr/lib/archboot/installer/blockdevices.sh
@@ -421,7 +421,7 @@ _createmd()
         while [[ -z "${_RAIDDEV}" ]]; do
             _dialog --inputbox "Enter the node name for the raiddevice:\n/dev/md[number]\n/dev/md0\n/dev/md1\n\n" 12 50 "/dev/md0" 2>"${_ANSWER}" || return 1
             _RAIDDEV=$(cat "${_ANSWER}")
-            if rg -q "^${_RAIDDEV//\/dev\//}" /proc/mdstat 2>${_NO_LOG}; then
+            if rg -q "^${_RAIDDEV//\/dev\//}" /proc/mdstat 2>"${_NO_LOG}"; then
                 _dialog --msgbox "ERROR: You have defined 2 identical node names! Please enter another name." 8 65
                 _RAIDDEV=""
             fi
diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index 642765dbf..933c7455c 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -124,7 +124,7 @@ _auto_packages() {
     fi
     #shellcheck disable=SC2010
     # Add iwd, if wlan is detected
-    if ls /sys/class/net | rg -q 'wlan'; then
+    if fd . /sys/class/net | rg -q 'wlan'; then
         ! echo "${_PACKAGES}" | rg -qw 'iwd' && _PACKAGES="${_PACKAGES} iwd"
     fi
     # Add broadcom-wl, if module is detected