diff --git a/hyperfi b/hyperfi
index 8b90eb7..7979517 100644
--- a/hyperfi
+++ b/hyperfi
@@ -1117,7 +1117,7 @@ archsetlocale(){
         echo "echo \"LC_COLLATE=C\" >> /mnt/etc/locale.conf"
         echo "LC_COLLATE=C" >> /mnt/etc/locale.conf
         echo "sed -i '/#${locale}.UTF-8/s/^#//g' /mnt/etc/locale.gen"
-        sed -i '/#'${locale}'.UTF-8/s/^#//g' /mnt/etc/locale.gen
+        sed -i '/#'"${locale}"'.UTF-8/s/^#//g' /mnt/etc/locale.gen
         archchroot setlocale
         pressanykey
     fi
@@ -1129,7 +1129,7 @@ archsetlocalechroot(){
 }
 
 archsettime(){
-    items=$(ls -l /mnt/usr/share/zoneinfo/ | grep '^d' | gawk -F':[0-9]* ' '/:/{print $2}')
+    items=$(find /usr/share/zoneinfo/ -mindepth 1 -maxdepth 1 -type d -printf '%f/\n' | sort)
     options=()
     for item in ${items}; do
         options+=("${item}" "")