diff --git a/tests/api.c b/tests/api.c
index 2e4d8a8a7..2b40ff531 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -39017,7 +39017,7 @@ static void test_wolfSSL_BIO_tls(void)
     SSL *ssl;
     BIO *readBio;
     BIO *writeBio;
-    int ret, err;
+    int ret, err = 0;
 
     AssertNotNull(ctx = SSL_CTX_new(SSLv23_method()));
     AssertNotNull(ssl = SSL_new(ctx));
diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c
index 6e3e3baeb..c1df29ff6 100644
--- a/wolfcrypt/src/ecc.c
+++ b/wolfcrypt/src/ecc.c
@@ -4788,7 +4788,7 @@ static WC_INLINE void wc_ecc_reset(ecc_key* key)
  *      ecc_curve_spec. Having this argument allows for not having to load the
  *      curve type multiple times when generating a key with wc_ecc_make_key().
  * For async the results are placed directly into pubOut, so this function 
- *      does not need called again
+ *      does not need to be called again
  *
  * returns MP_OKAY on success
  */
@@ -4797,10 +4797,6 @@ static int ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
 {
     int err = MP_OKAY;
 #ifdef HAVE_ECC_MAKE_PUB
-#if !defined(WOLFSSL_SP_MATH) && !(defined(WOLFSSL_ASYNC_CRYPT) && \
-        defined(WC_ASYNC_ENABLE_ECC) && defined(HAVE_INTEL_QA))
-    ecc_point* base = NULL;
-#endif
     ecc_point* pub;
     DECLARE_CURVE_SPECS(ECC_CURVE_FIELD_COUNT);
 #endif /* HAVE_ECC_MAKE_PUB */
@@ -4903,6 +4899,7 @@ static int ecc_make_pub_ex(ecc_key* key, ecc_curve_spec* curveIn,
 #else
     if (err == MP_OKAY) {
         mp_digit mp = 0;
+        ecc_point* base = NULL;
     #ifdef WOLFSSL_NO_MALLOC
         ecc_point  lcl_base;
         base = &lcl_base;