diff --git a/src/x509_str.c b/src/x509_str.c
index 804428dfd2..b0f5752290 100644
--- a/src/x509_str.c
+++ b/src/x509_str.c
@@ -1453,7 +1453,8 @@ int wolfSSL_X509_STORE_set_default_paths(WOLFSSL_X509_STORE* store)
 int X509StoreLoadCertBuffer(WOLFSSL_X509_STORE *str,
                                         byte *buf, word32 bufLen, int type)
 {
-    int ret = WC_NO_ERR_TRACE(WOLFSSL_SUCCESS);
+    int ret = WOLFSSL_SUCCESS;
+
     WOLFSSL_X509 *x509 = NULL;
 
     if (str == NULL || buf == NULL) {
diff --git a/tests/api.c b/tests/api.c
index 2d23ab6207..3c376bbae4 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -76347,7 +76347,7 @@ static int test_wolfSSL_X509V3_EXT_aia(void)
         sk = NULL;
     }
     /* Extension stack set but empty. */
-    ExpectNotNull(aia = wolfSSL_X509V3_EXT_d2i(ext));
+    ExpectNotNull(aia = (WOLFSSL_AUTHORITY_INFO_ACCESS *)wolfSSL_X509V3_EXT_d2i(ext));
     wolfSSL_AUTHORITY_INFO_ACCESS_free(aia);
     aia = NULL;
 
@@ -76367,7 +76367,7 @@ static int test_wolfSSL_X509V3_EXT_aia(void)
             node = NULL;
         }
     }
-    ExpectNotNull(aia = wolfSSL_X509V3_EXT_d2i(ext));
+    ExpectNotNull(aia = (WOLFSSL_AUTHORITY_INFO_ACCESS *)wolfSSL_X509V3_EXT_d2i(ext));
     wolfSSL_ACCESS_DESCRIPTION_free(NULL);
 
     wolfSSL_AUTHORITY_INFO_ACCESS_pop_free(aia,