diff --git a/scripts/specialize-patch b/scripts/specialize-patch
index 5c002442f..06e49bafc 100755
--- a/scripts/specialize-patch
+++ b/scripts/specialize-patch
@@ -553,7 +553,7 @@ function process_preprocessor_statement(evaluated, condition) {
       if (debug)
         printf "/* debug specialize-patch: (g1b) %s: decision[%d] = %s */\n", \
           evaluated, i, decision[i]
-      output = output && decision[i] != "+#if 0" && decision[i] != "+#elif 0"
+      output = output && decision[i] !~ "^+#(if|elif) 0($| &&)"
     }
     if (output)
       any_section_output[if_nesting_level] = 1
diff --git a/scst/include/backport.h b/scst/include/backport.h
index ef0208006..0d58c05b1 100644
--- a/scst/include/backport.h
+++ b/scst/include/backport.h
@@ -2152,7 +2152,7 @@ static inline int fc_block_rport(struct fc_rport *rport)
  */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) &&			\
 	(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 ||			\
-	 RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 4) &&			\
+	 (RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 4)) &&			\
 	!(defined(UEK_KABI_RENAME) && defined(FC_PORTSPEED_256GBIT))
 #define ELS_RDP 0x18
 #endif