diff --git a/configure.ac b/configure.ac
index 21a66206b..ecd6d873e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1726,7 +1726,8 @@ AC_ARG_ENABLE([error-queue-per-thread],
 
 if test "$ENABLED_ERRORQUEUEPERTHREAD" = "check"
 then
-    AS_IF([test "$thread_ls_on" = "no"],
+    AS_IF([test "$thread_ls_on" = "no" ||
+           test "$ENABLED_SINGLETHREADED" = "yes"],
         [ENABLED_ERRORQUEUEPERTHREAD=no],
         [ENABLED_ERRORQUEUEPERTHREAD=yes])
 fi
diff --git a/src/ocsp.c b/src/ocsp.c
index b1d89a165..d8f291f4a 100644
--- a/src/ocsp.c
+++ b/src/ocsp.c
@@ -1137,7 +1137,7 @@ WOLFSSL_OCSP_ONEREQ* wolfSSL_OCSP_request_add0_id(OcspRequest *req,
         return NULL;
 
     if (req->cid != NULL)
-        wolfSSL_OCSP_CERTID_free(req->cid);
+        wolfSSL_OCSP_CERTID_free((WOLFSSL_OCSP_CERTID*)req->cid);
     /* Keep to free */
     req->cid = (void*)cid;
 
diff --git a/tests/api.c b/tests/api.c
index ada4447ee..8c5dcb391 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -1447,7 +1447,8 @@ static int test_wolfSSL_CTX_load_verify_locations(void)
     /* Get cert cache size */
     ExpectIntGT(cacheSz = wolfSSL_CTX_get_cert_cache_memsize(ctx), 0);
 
-    ExpectNotNull(cache = XMALLOC(cacheSz, NULL, DYNAMIC_TYPE_TMP_BUFFER));
+    ExpectNotNull(cache = (byte*)XMALLOC(cacheSz, NULL,
+                            DYNAMIC_TYPE_TMP_BUFFER));
 
     ExpectIntEQ(wolfSSL_CTX_memsave_cert_cache(NULL, NULL, -1, NULL),
         BAD_FUNC_ARG);