diff --git a/lib/evse_security/crypto/openssl/openssl_supplier.cpp b/lib/evse_security/crypto/openssl/openssl_supplier.cpp
index 79d8632..a5d0d0e 100644
--- a/lib/evse_security/crypto/openssl/openssl_supplier.cpp
+++ b/lib/evse_security/crypto/openssl/openssl_supplier.cpp
@@ -174,7 +174,8 @@ static bool s_generate_key(const KeyGenerationInfo& key_info, KeyHandle_ptr& out
     }
 
 #if EVSE_OPENSSL_VER_3
-    OSSL_PARAM params[2] = {NULL, NULL};
+    OSSL_PARAM params[2];
+    std::memset(&params[0], 0, sizeof(params));
 
     if (bEC) {
         params[0] = OSSL_PARAM_construct_utf8_string("group", group, group_sz);
diff --git a/lib/evse_security/crypto/openssl/openssl_tpm.cpp b/lib/evse_security/crypto/openssl/openssl_tpm.cpp
index ad1ee75..ca455a6 100644
--- a/lib/evse_security/crypto/openssl/openssl_tpm.cpp
+++ b/lib/evse_security/crypto/openssl/openssl_tpm.cpp
@@ -255,3 +255,4 @@ void OpenSSLProvider::cleanup() {
 #endif // USING_OPENSSL_3_TPM
 
 } // namespace evse_security
+
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 37acdf3..1dd0668 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -201,7 +201,7 @@ TEST_F(EvseSecurityTests, verify_expired_csr_deletion) {
     ASSERT_FALSE(fs::exists(csr_key_path));
 }
 
-TEST_F(EvseSecurityTests, verify_expired_leaf_deletion) {
+TEST_F(EvseSecurityTests, DISABLED_verify_expired_leaf_deletion) {
     // Copy many expired certificates
     std::set<fs::path> existing;