diff --git a/usr/bin/archboot-aarch64-iso.sh b/usr/bin/archboot-aarch64-iso.sh
index 790e3488d..9a4eedaf7 100755
--- a/usr/bin/archboot-aarch64-iso.sh
+++ b/usr/bin/archboot-aarch64-iso.sh
@@ -109,7 +109,7 @@ _prepare_fedora_shim_bootloaders () {
 _prepare_uefi_image() {
     ## get size of boot x86_64 files
     BOOTSIZE=$(du -bc "${_AARCH64}"/EFI | grep total | cut -f1)
-    IMGSZ=$(( (${BOOTSIZE}*102)/100/1024 + 1)) # image size in sectors	
+    IMGSZ=$(( (BOOTSIZE*102)/100/1024 + 1)) # image size in sectors	
     ## Create cdefiboot.img
     dd if=/dev/zero of="${_AARCH64}"/efi.img bs="${IMGSZ}" count=1024
     VFAT_IMAGE="${_AARCH64}/efi.img"
diff --git a/usr/bin/archboot-aarch64-release.sh b/usr/bin/archboot-aarch64-release.sh
index c478eccae..f36458cac 100755
--- a/usr/bin/archboot-aarch64-release.sh
+++ b/usr/bin/archboot-aarch64-release.sh
@@ -67,6 +67,7 @@ for i in *.iso; do
         isoinfo -R -i "${i}" -x /"${_KERNEL}" 2>/dev/null > "${_KERNEL}"
     else
         isoinfo -R -i "${i}" -x /"${_INITRAMFS}" 2>/dev/null > "${_INITRAMFS_LATEST}"
+    fi
 done
 cp /usr/share/licenses/amd-ucode/* boot/licenses/amd-ucode/
 # create torrent files
diff --git a/usr/bin/archboot-x86_64-iso.sh b/usr/bin/archboot-x86_64-iso.sh
index 388d61462..c3095099d 100755
--- a/usr/bin/archboot-x86_64-iso.sh
+++ b/usr/bin/archboot-x86_64-iso.sh
@@ -113,7 +113,7 @@ _prepare_fedora_shim_bootloaders () {
 _prepare_uefi_image() {
     ## get size of boot x86_64 files
     BOOTSIZE=$(du -bc "${_X86_64}"/EFI | grep total | cut -f1)
-    IMGSZ=$(( (${BOOTSIZE}*102)/100/1024 + 1)) # image size in sectors
+    IMGSZ=$(( (BOOTSIZE*102)/100/1024 + 1)) # image size in sectors
     ## Create cdefiboot.img
     dd if=/dev/zero of="${_X86_64}"/efi.img bs="${IMGSZ}" count=1024
     VFAT_IMAGE="${_X86_64}/efi.img"
diff --git a/usr/bin/archboot-x86_64-release.sh b/usr/bin/archboot-x86_64-release.sh
index 42964746f..4c20e7365 100755
--- a/usr/bin/archboot-x86_64-release.sh
+++ b/usr/bin/archboot-x86_64-release.sh
@@ -8,7 +8,7 @@ _AMD_UCODE="boot/amd-ucode.img"
 _INTEL_UCODE="boot/intel-ucode.img"
 _INITRAMFS="boot/initramfs_${_ARCH}.img"
 _INITRAMFS_LATEST="boot/initramfs_${_ARCH}-latest.img"
-_KERNEL="vmlinuz_${__ARCH}"
+_KERNEL="vmlinuz_${_ARCH}"
 _W_DIR="$(mktemp -u archboot-release.XXX)"
 
 usage () {