diff --git a/src/internal.c b/src/internal.c
index 436565353..d127cd299 100644
--- a/src/internal.c
+++ b/src/internal.c
@@ -42369,7 +42369,7 @@ WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_value(
 WOLFSSL_BY_DIR_HASH* wolfSSL_sk_BY_DIR_HASH_pop(
                                 WOLF_STACK_OF(WOLFSSL_BY_DIR_HASH)* sk)
 {
-    return wolfSSL_sk_pop(sk);
+    return (WOLFSSL_BY_DIR_HASH *)wolfSSL_sk_pop(sk);
 }
 /* release all contents in stack, and then release stack itself. */
 /* Second argument is a function pointer to release resources.   */
@@ -42501,7 +42501,7 @@ WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_value(
 WOLFSSL_BY_DIR_entry* wolfSSL_sk_BY_DIR_entry_pop(
                                 WOLF_STACK_OF(WOLFSSL_BY_DIR_entry)* sk)
 {
-    return wolfSSL_sk_pop(sk);
+    return (WOLFSSL_BY_DIR_entry *)wolfSSL_sk_pop(sk);
 }
 /* release all contents in stack, and then release stack itself. */
 /* Second argument is a function pointer to release resources.   */
diff --git a/tests/api.c b/tests/api.c
index fcfb98e14..bdf4c1bbe 100644
--- a/tests/api.c
+++ b/tests/api.c
@@ -33034,7 +33034,7 @@ static int test_wolfSSL_PKCS8_d2i(void)
     bio = NULL;
 
     /* https://github.com/wolfSSL/wolfssl/issues/8610 */
-    bytes = (int)XSTRLEN((void*)pkcs8_buffer);
+    bytes = (int)XSTRLEN((char *)pkcs8_buffer);
     ExpectNotNull(bio = BIO_new_mem_buf((void*)pkcs8_buffer, bytes));
     ExpectIntEQ(BIO_get_mem_data(bio, &p), bytes);
     ExpectIntEQ(XMEMCMP(p, pkcs8_buffer, bytes), 0);