diff --git a/linux54-tkg/PKGBUILD b/linux54-tkg/PKGBUILD
index 7c24d2b..66724b3 100644
--- a/linux54-tkg/PKGBUILD
+++ b/linux54-tkg/PKGBUILD
@@ -1012,10 +1012,10 @@ function exit_cleanup {
 
   # Community patches removal in case of failure
   for _p in ${_community_patches[@]}; do
-    rm -f "$_where"/$_p
+    rm -f "$_where"/"$_p"
   done
 
-  if [ $_NUKR == "true" ]; then
+  if [ "$_NUKR" == "true" ]; then
     rm -rf "$_where"/src/*
     # Double tap
     rm -rf "$srcdir"/linux-*
diff --git a/linux55-tkg/PKGBUILD b/linux55-tkg/PKGBUILD
index 7926beb..6ac8ec6 100644
--- a/linux55-tkg/PKGBUILD
+++ b/linux55-tkg/PKGBUILD
@@ -1064,10 +1064,10 @@ function exit_cleanup {
 
   # Community patches removal in case of failure
   for _p in ${_community_patches[@]}; do
-    rm -f "$_where"/$_p
+    rm -f "$_where"/"$_p"
   done
 
-  if [ $_NUKR == "true" ]; then
+  if [ "$_NUKR" == "true" ]; then
     rm -rf "$_where"/src/*
     # Double tap
     rm -rf "$srcdir"/linux-*
diff --git a/linux56-tkg/PKGBUILD b/linux56-tkg/PKGBUILD
index 96c3d08..2f2b789 100644
--- a/linux56-tkg/PKGBUILD
+++ b/linux56-tkg/PKGBUILD
@@ -1067,10 +1067,10 @@ function exit_cleanup {
 
   # Community patches removal in case of failure
   for _p in ${_community_patches[@]}; do
-    rm -f "$_where"/$_p
+    rm -f "$_where"/"$_p"
   done
 
-  if [ $_NUKR == "true" ]; then
+  if [ "$_NUKR" == "true" ]; then
     rm -rf "$_where"/src/*
     # Double tap
     rm -rf "$srcdir"/linux-*
diff --git a/linux57-rc-tkg/PKGBUILD b/linux57-rc-tkg/PKGBUILD
index e272f76..bfc72f9 100644
--- a/linux57-rc-tkg/PKGBUILD
+++ b/linux57-rc-tkg/PKGBUILD
@@ -1057,10 +1057,10 @@ function exit_cleanup {
 
   # Community patches removal in case of failure
   for _p in ${_community_patches[@]}; do
-    rm -f "$_where"/$_p
+    rm -f "$_where"/"$_p"
   done
 
-  if [ $_NUKR == "true" ]; then
+  if [ "$_NUKR" == "true" ]; then
     rm -rf "$_where"/src/*
     # Double tap
     rm -rf "$srcdir"/linux-*