diff --git a/ciss_live_builder.sh b/ciss_live_builder.sh
index a406fc0..49ca176 100644
--- a/ciss_live_builder.sh
+++ b/ciss_live_builder.sh
@@ -205,7 +205,7 @@ if ! ${VAR_HANDLER_AUTOBUILD}; then printf "XXX\nInitialization completed ... \n
 if ! ${VAR_HANDLER_AUTOBUILD}; then boot_screen_cleaner; fi
 
 ### MAIN Program
-#arg_priority_check
+#arg_priority_check # TODO: Fixing workflow issues
 check_stats
 if ! ${VAR_HANDLER_AUTOBUILD}; then check_provider; fi
 if ! ${VAR_HANDLER_AUTOBUILD}; then check_kernel; fi
diff --git a/lib/lib_arg_priority_check.sh b/lib/lib_arg_priority_check.sh
index 55bc30b..c83ec90 100644
--- a/lib/lib_arg_priority_check.sh
+++ b/lib/lib_arg_priority_check.sh
@@ -24,7 +24,7 @@ guard_sourcing
 arg_priority_check() {
   declare var
   ### Check if nice PRIORITY is set and adjust nice priority.
-  if [[ -n ${VAR_HANDLER_PRIORITY:-} ]]; then
+  if [[ -n "${VAR_HANDLER_PRIORITY:-}" ]]; then
     if command -v renice >/dev/null; then
       renice "${VAR_HANDLER_PRIORITY}" -p "$$"
       var=$(ps -o ni= -p $$) > /dev/null 2>&1
@@ -37,7 +37,7 @@ arg_priority_check() {
   fi
 
   ### Check if ionice PRIORITY is set and adjust ionice priority.
-  if [[ -n ${VAR_REIONICE_CLASS:-} ]]; then
+  if [[ -n "${VAR_REIONICE_CLASS:-}" ]]; then
     if command -v ionice >/dev/null; then
       ionice -c"${VAR_REIONICE_CLASS:-2}" -n"${VAR_REIONICE_PRIORITY:-4}" -p "$$"
       var=$(ionice -p $$) > /dev/null 2>&1