diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
index b302d62e6..12db2fb2e 100755
--- a/kpatch-build/kpatch-build
+++ b/kpatch-build/kpatch-build
@@ -1424,7 +1424,7 @@ for i in $FILES; do
 
 		# create-diff-object orig.o patched.o parent-name parent-symtab
 		#		     Module.symvers patch-mod-name output.o
-		"$TOOLSDIR"/create-diff-object $CDO_FLAGS "orig/$i" "patched/$i" "$KOBJFILE_NAME" \
+		"$TOOLSDIR"/create-diff-object "${CDO_FLAGS[@]}" "orig/$i" "patched/$i" "$KOBJFILE_NAME" \
 			"$SYMTAB" "$SYMVERS_FILE" "${MODNAME//-/_}" \
 			"output/$i" 2>&1 | logger 1
 		check_pipe_status create-diff-object
@@ -1494,7 +1494,7 @@ cd "$TEMPDIR/patch" || die
 
 # We no longer need kpatch-cc
 for ((idx=0; idx<${#MAKEVARS[@]}; idx++)); do
-    MAKEVARS[$idx]=${MAKEVARS[$idx]/${KPATCH_CC_PREFIX}/}
+    MAKEVARS[idx]=${MAKEVARS[idx]/${KPATCH_CC_PREFIX}/}
 done
 
 export KPATCH_BUILD="$KERNEL_SRCDIR" KPATCH_NAME="$MODNAME" \
@@ -1510,7 +1510,7 @@ if [[ "$USE_KLP" -eq 1 ]]; then
 		extra_flags="--no-klp-arch-sections"
 	fi
 	cp -f "$TEMPDIR/patch/$MODNAME.ko" "$TEMPDIR/patch/tmp.ko" || die
-	"$TOOLSDIR"/create-klp-module $extra_flags "$TEMPDIR/patch/tmp.ko" "$TEMPDIR/patch/$MODNAME.ko" 2>&1 | logger 1
+	"$TOOLSDIR"/create-klp-module "${extra_flags[@]}" "$TEMPDIR/patch/tmp.ko" "$TEMPDIR/patch/$MODNAME.ko" 2>&1 | logger 1
 	check_pipe_status create-klp-module
 	[[ "$rc" -ne 0 ]] && die "create-klp-module: exited with return code: $rc"
 fi
diff --git a/kpatch/kpatch b/kpatch/kpatch
index edfccfead..0e94a5d73 100755
--- a/kpatch/kpatch
+++ b/kpatch/kpatch
@@ -355,7 +355,6 @@ load_module () {
 			i=$((i+1))
 			if [[ $i -eq $MAX_LOAD_ATTEMPTS ]]; then
 				die "failed to load module $module"
-				break
 			else
 				warn "retrying..."
 				sleep $RETRY_INTERVAL
diff --git a/test/integration/lib.sh b/test/integration/lib.sh
index 84a6dc80c..86b09e4b2 100644
--- a/test/integration/lib.sh
+++ b/test/integration/lib.sh
@@ -116,7 +116,7 @@ kpatch_photon_dependencies()
 	if [[ -z "$flavor" ]]; then
 		tdnf install -y linux-debuginfo
 	else
-		tdnf install -y linux-$flavor-debuginfo
+		tdnf install -y "linux-$flavor-debuginfo"
 	fi
 }