diff --git a/scripts/Arch/OS/setup.fish b/scripts/Arch/OS/setup.fish
index 57b2c25b..494c4705 100755
--- a/scripts/Arch/OS/setup.fish
+++ b/scripts/Arch/OS/setup.fish
@@ -97,7 +97,7 @@ begin
         set -l file "/etc/systemd/system/getty@tty1.service.d/autologin.conf"
         arch-chroot "$mountDir" mkdir -p (dirname "$file")
 
-        begin
+        and begin
             printf %s\n \
                 "[Service]" \
                 "ExecStart=" \
diff --git a/scripts/Common/OS/setup.fish b/scripts/Common/OS/setup.fish
index 7ae4acf2..3e0f875e 100755
--- a/scripts/Common/OS/setup.fish
+++ b/scripts/Common/OS/setup.fish
@@ -32,9 +32,9 @@ function runSetup
     function runInOS -S
         set -l script "/root/run_once"
         wrapScript $argv | chroot "$mountDir" tee "$script" > /dev/null
-        runChroot "$mountDir" chmod +x "$script"
-        runChroot "$mountDir" "$script"
-        runChroot "$mountDir" rm "$script"
+        and runChroot "$mountDir" chmod +x "$script"
+        and runChroot "$mountDir" "$script"
+        and runChroot "$mountDir" rm "$script"
     end
 
     function wrapScript -S