diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 100bf5a5..277cd292 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -2057,6 +2057,10 @@ sed -i "s|use-ipv4=.*|use-ipv4=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 sed -i "s|use-ipv6=.*|use-ipv6=no|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 sed -i "s|hosts:.*|hosts:          files mdns4_minimal dns mdns4 mdns|g" "$rootdir/etc/nsswitch.conf"
+sed -i "s|#publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+sed -i "s|publish-domain=.*|publish-domain=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+sed -i "s|#publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
+sed -i "s|publish-addresses=.*|publish-addresses=yes|g" "$rootdir/etc/avahi/avahi-daemon.conf"
 
 # Add an ssh avahi service
 { echo '<?xml version="1.0" standalone="no"?><!--*-nxml-*-->';
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 4f976740..680d7dee 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -47,7 +47,7 @@ beaglebone_setup_boot() {
         fstype=ext4
     fi
     # shellcheck disable=SC2012
-    kernelVersion=$(ls "/usr/lib/*/am335x-boneblack.dtb" | head -1 | cut -d/ -f4)
+    kernelVersion=$(ls /usr/lib/*/am335x-boneblack.dtb | head -1 | cut -d/ -f4)
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
     initRd=initrd.img-$version
     vmlinuz=vmlinuz-$version
@@ -116,7 +116,7 @@ beaglebone_repack_kernel() {
     bbb_dtb='am335x-boneblack'
 
     # shellcheck disable=SC2012
-    kernelVersion=$(ls "/usr/lib/*/${bbb_dtb}.dtb" | head -1 | cut -d/ -f4)
+    kernelVersion=$(ls /usr/lib/*/${bbb_dtb}.dtb | head -1 | cut -d/ -f4)
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
     initRd=initrd.img-$version
     vmlinuz=vmlinuz-$version
@@ -164,8 +164,8 @@ a20_setup_boot() {
     else
         fstype=ext4
     fi
-    # shellcheck disable=SC2012
-    kernelVersion=$(ls "/usr/lib/*/$dtb" | head -1 | cut -d/ -f4)
+    # shellcheck disable=SC2012,SC2086
+    kernelVersion=$(ls /usr/lib/*/$dtb | head -1 | cut -d/ -f4)
     version=$(echo "$kernelVersion" | sed 's/linux-image-\(.*\)/\1/')
     initRd=initrd.img-$version
     vmlinuz=vmlinuz-$version
@@ -207,7 +207,8 @@ EOF
 
     # Copy all DTBs
     mkdir -p /boot/dtbs
-    cp "/usr/lib/$kernelVersion/"* /boot/dtbs
+    # shellcheck disable=SC2086
+    cp /usr/lib/$kernelVersion/* /boot/dtbs
 
     # extra boot modules
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules