diff --git a/configure.ac b/configure.ac
index 151d3d98d..0ab7f3c83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -569,7 +569,6 @@ AC_CHECK_HEADERS([sys/wait.h], [HAVE_SYS_WAIT_H=1])
 AM_CONDITIONAL(WITH_PCRE2_8, test "x$enable_pcre2_8" = "xyes")
 AM_CONDITIONAL(WITH_PCRE2_16, test "x$enable_pcre2_16" = "xyes")
 AM_CONDITIONAL(WITH_PCRE2_32, test "x$enable_pcre2_32" = "xyes")
-AM_CONDITIONAL(WITH_DEBUG, test "x$enable_debug" = "xyes")
 AM_CONDITIONAL(WITH_REBUILD_CHARTABLES, test "x$enable_rebuild_chartables" = "xyes")
 AM_CONDITIONAL(WITH_JIT, test "x$enable_jit" = "xyes")
 AM_CONDITIONAL(WITH_UNICODE, test "x$enable_unicode" = "xyes")
diff --git a/maint/ManyConfigTests b/maint/ManyConfigTests
index d93feec88..6d0a98cfe 100755
--- a/maint/ManyConfigTests
+++ b/maint/ManyConfigTests
@@ -110,11 +110,12 @@ tmp=/tmp/pcre2testing
 
 CFLAGS="-g"
 OFLAGS="-O0"
+CC="${CC:=cc}"
 ISGCC=0
 
 # If the compiler is gcc, add a lot of warning switches.
 
-cc --version >/tmp/pcre2ccversion 2>/dev/null
+$CC --version >/tmp/pcre2ccversion 2>/dev/null
 if [ $? -eq 0 ] && grep GCC /tmp/pcre2ccversion >/dev/null; then
   ISGCC=1
   CFLAGS="$CFLAGS -Wall"
diff --git a/src/pcre2_jit_neon_inc.h b/src/pcre2_jit_neon_inc.h
index d3d189289..8baa337f1 100644
--- a/src/pcre2_jit_neon_inc.h
+++ b/src/pcre2_jit_neon_inc.h
@@ -87,7 +87,7 @@ POSSIBILITY OF SUCH DAMAGE.
 #pragma GCC diagnostic ignored "-Wdeclaration-after-statement"
 #endif
 
-#if (defined(__GNUC__) && __SANITIZE_ADDRESS__) \
+#if (defined(__GNUC__) && defined(__SANITIZE_ADDRESS__) && __SANITIZE_ADDRESS__ ) \
 	|| (defined(__clang__) \
 	&& ((__clang_major__ == 3 && __clang_minor__ >= 3) || (__clang_major__ > 3)))
 __attribute__((no_sanitize_address))