diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 082c9bd..d501c7b 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -56,14 +56,14 @@ build() {
     sed 's:/usr/sbin/qubes-firewall:/usr/bin/qubes-firewall:g' -i vm-systemd/qubes-firewall.service
 
     for dir in qubes-rpc qrexec misc; do
-      (cd $dir || exit 1; make)
+        make -C "$dir"
     done
 }
 
 package() {
     # Note: Archlinux removed use of directory such as /sbin /bin /usr/sbin (https://mailman.archlinux.org/pipermail/arch-dev-public/2012-March/022625.html)
     # shellcheck disable=SC2154
-    (cd qrexec || exit 1; make install DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib)
+    make -C qrexec install DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
 
     make install-vm DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux
 
diff --git a/archlinux/PKGBUILD.install b/archlinux/PKGBUILD.install
index 3a57314..5265c3b 100644
--- a/archlinux/PKGBUILD.install
+++ b/archlinux/PKGBUILD.install
@@ -102,7 +102,7 @@ update_qubesconfig() {
 
     # Location of files which contains list of protected files
     mkdir -p /etc/qubes/protected-files.d
-    # shellcheck source=../init/functions
+    # shellcheck source=init/functions
     . /usr/lib/qubes/init/functions
 
     # qubes-core-vm has been broken for some time - it overrides /etc/hosts; restore original content
@@ -215,7 +215,7 @@ preset_units() {
 }
 
 restore_units() {
-    while read -r action unit_name < grep '^[[:space:]]*[^#;]' "$1"
+    grep '^[[:space:]]*[^#;]' "$1" | while read -r action unit_name
     do
         if is_static "$unit_name" && is_masked "$unit_name"
         then