diff --git a/libmariadb/secure/openssl.c b/libmariadb/secure/openssl.c
index 56d61b40..c3ca817d 100644
--- a/libmariadb/secure/openssl.c
+++ b/libmariadb/secure/openssl.c
@@ -408,9 +408,10 @@ static int ma_ssl_set_certs(MYSQL *mysql)
     if ((certstore= SSL_CTX_get_cert_store(SSL_context)))
     {
       if (X509_STORE_load_locations(certstore, mysql->options.extension->ssl_crl,
-                                               mysql->options.extension->ssl_crlpath) == 0 ||
-          X509_STORE_set_flags(certstore, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL) == 0)
+                                               mysql->options.extension->ssl_crlpath) == 0)
         goto error;
+
+      X509_STORE_set_flags(certstore, X509_V_FLAG_CRL_CHECK | X509_V_FLAG_CRL_CHECK_ALL);
     }
   }
   return 0;
diff --git a/zlib/gzguts.h b/zlib/gzguts.h
index 466442db..00a93dfa 100644
--- a/zlib/gzguts.h
+++ b/zlib/gzguts.h
@@ -12,7 +12,7 @@
 #  endif
 #endif
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 40) && !defined(NO_VIZ)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL
diff --git a/zlib/zutil.h b/zlib/zutil.h
index 258fa887..b108a0b5 100644
--- a/zlib/zutil.h
+++ b/zlib/zutil.h
@@ -13,7 +13,7 @@
 #ifndef ZUTIL_H
 #define ZUTIL_H
 
-#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ)
+#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 40) && !defined(NO_VIZ)
 #  define ZLIB_INTERNAL __attribute__((visibility ("hidden")))
 #else
 #  define ZLIB_INTERNAL