diff --git a/install-stage1.sh b/install-stage1.sh
index 49c3bfd..ea0ae63 100644
--- a/install-stage1.sh
+++ b/install-stage1.sh
@@ -35,7 +35,7 @@ function yesno {
 }
 
 function run_in_target {
-  xchroot /mnt/target "$@"
+  echo "$@" | xchroot /mnt/target sh
 }
 
 clear
@@ -208,7 +208,7 @@ fi
 #TODO timezone
 
 clear
-echo "Set hardware clock to UTC?
+echo "Is the hardware clock set to UTC?
 
 Most Unix/Linux systems set the clock in your computer to UTC and add
 the time zone on-the-fly. If you use Windows, you will want to answer no here.
@@ -272,9 +272,9 @@ This avoids default kernel hooks breaking the custom config." > /mnt/target/boot
 
 # no idea if any of these are even necessary/relevant but it can’t hurt...
 TARGET_PRELOAD_GRUB_MODULES="usb usbms uhci ehci ohci part_gpt f2fs"
-run_in_target grub-install --target=i386-pc --boot-directory=/boot/efi/LOADER --disk-module=native --modules="$TARGET_PRELOAD_GRUB_MODULES" "/dev/$TARGET_DISK"
-run_in_target grub-install --target=i386-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="$TARGET_PRELOAD_GRUB_MODULES" "/dev/$TARGET_DISK"
-run_in_target grub-install --target=x86_64-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="$TARGET_PRELOAD_GRUB_MODULES" "/dev/$TARGET_DISK"
+run_in_target grub-install --target=i386-pc --boot-directory=/boot/efi/LOADER --disk-module=native --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'"
+run_in_target grub-install --target=i386-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'"
+run_in_target grub-install --target=x86_64-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'"