diff --git a/zlibs/bootstrap b/zlibs/bootstrap
index d4b6787..a14ae88 100644
--- a/zlibs/bootstrap
+++ b/zlibs/bootstrap
@@ -207,11 +207,12 @@ EOF
 	for i in $inittab; do
 		grep -q "^$i" $strapdir/etc/inittab && continue
 		print "$i" | sudo tee -a $strapdir/etc/inittab >/dev/null
+	done
 
 	for i in $custmodules; do
 		grep -q "^$i" $strapdir/etc/modules && continue
 		print "$i" | sudo tee -a $strapdir/etc/modules >/dev/null
-	done || return 0
+	done
 
-	[[ -n "$TAR_STAGE4" ]] bootstrap_tar_pack "$bootstrap_tgz_stage4"
+	[[ -n "$TAR_STAGE4" ]] && bootstrap_tar_pack "$bootstrap_tgz_stage4"
 }
diff --git a/zlibs/iso b/zlibs/iso
index 69ae0f1..defd5aa 100644
--- a/zlibs/iso
+++ b/zlibs/iso
@@ -103,9 +103,14 @@ iso_squash_strap() {
 
 	notice "creating squashfs out of strapdir"
 
+	_extraopts=()
+	if [[ "$arch" = amd64 ]]; then
+		_extraopts+=(-Xbcj x86)
+	fi
+
 	pushd $workdir
 	sudo mksquashfs $strapdir binary/live/filesystem.squashfs \
-		-Xbcj x86 -noappend -comp xz || zerr
+		${_extraopts} -noappend -comp xz || zerr
 	popd
 	unset uefi_opt
 }