diff --git a/install-stage1.sh b/install-stage1.sh
index e832fcd..3bbe7eb 100644
--- a/install-stage1.sh
+++ b/install-stage1.sh
@@ -157,11 +157,13 @@ the chosen mirror from the config file it generates.
 press_any_key
 
 xmirror
+#TODO: also remove CPU architecture
 TARGET_MIRROR="$(sed 's/repository=//;s|/musl$||' /etc/xbps.d/00-repository-main.conf)"
 
 #TODO: select installation type
 TARGET_TYPE="x86_64"
 
+#TODO: also add CPU architecture
 if grep "musl" <<< "$TARGET_TYPE"; then
   TARGET_MIRROR="$TARGET_MIRROR/musl"
 fi
diff --git a/opt/grub-config b/opt/grub-config
index 98dda5d..dc72741 100644
--- a/opt/grub-config
+++ b/opt/grub-config
@@ -22,12 +22,12 @@ function make_menuentry {
   # $1 is the kernel path
 
   # We don’t want duplicate entries for /boot/vmlinuz symlink
-  if [ -L $1 ]; then
+  if [ -L "$1" ]; then
     return 0
   fi
 
   # exclude garbage globbing results
-  if [ ! -f $1 ]; then
+  if [ ! -f "$1" ]; then
     return 0
   fi