diff --git a/README.md b/README.md
index ddfb1e5..e28435a 100644
--- a/README.md
+++ b/README.md
@@ -37,13 +37,19 @@ Due to [licensing concerns with OpenZFS and Linux](https://openzfs.github.io/ope
       --graphics vnc,listen=127.0.0.1,port=5901 \
       --boot uefi,loader=/usr/shar/OVMF/OVMF_CODE.fd
     ```
-6. If dropped into initramfs
+6. If dropped into UEFI shell
+    ```
+    Shell> FS0:
+    FS0:\> cd EFI\debian
+    FS0:\EFI\debian\> grubx64.efi
+    ```
+7. If dropped into initramfs
     ```
     zpool import -f rpool
     exit
     ```
-7. Enter rpool password
-8. Login with root's password
+8. Enter rpool password
+9. Login with root's password
 
 ### License
 - DebianZFS is licensed under 0BSD, a public domain equivalent license; see the `LICENSE` file for more information
\ No newline at end of file
diff --git a/debianzfs.sh b/debianzfs.sh
index 6298e9e..7414599 100644
--- a/debianzfs.sh
+++ b/debianzfs.sh
@@ -163,12 +163,15 @@ cd
 
 # Configure a basic system environment
 export DEBIAN_FRONTEND=noninteractive
-export LC_CTYPE=en_US.UTF-8
-export LC_ALL=en_US.UTF-8
 ln -s /proc/self/mounts /etc/mtab
 apt-get update
 apt-get upgrade -y
 apt-get install -y console-setup locales
+sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen
+locale-gen
+export LC_CTYPE=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+export LANGUAGE=en_US.UTF-8
 dpkg-reconfigure locales tzdata keyboard-configuration console-setup
 apt-get install -y dpkg-dev linux-headers-generic linux-image-generic zfs-initramfs
 echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf
@@ -178,7 +181,7 @@ apt-get install -y dosfstools
 echo REMAKE_INITRD=yes > /etc/dkms/zfs.conf
 mkdosfs -F 32 -s 1 -n EFI "${DISK}2"
 mkdir /boot/efi
-echo "${DISK}2" /boot/efi vfat defaults 0 0 >> /etc/fstab
+echo "/dev/sda2" /boot/efi vfat defaults 0 0 >> /etc/fstab
 mount /boot/efi
 apt-get install -y grub-efi-amd64 shim-signed
 apt-get purge -y os-prober