diff --git a/src/internal.c b/src/internal.c
index 25fa2ac48..e1a10e895 100755
--- a/src/internal.c
+++ b/src/internal.c
@@ -7142,7 +7142,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz
                         ret = wolfSSL_AsyncPush(ssl,
                             args->dCert->sigCtx.asyncDev,
                             WC_ASYNC_FLAG_CALL_AGAIN);
-                        goto exit_dc;
+                        goto exit_ppc;
                     }
                 #endif
 
@@ -7306,7 +7306,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx, word32 totalSz
                         ret = wolfSSL_AsyncPush(ssl,
                             args->dCert->sigCtx.asyncDev,
                             WC_ASYNC_FLAG_CALL_AGAIN);
-                        goto exit_dc;
+                        goto exit_ppc;
                     }
                 #endif
                 }
diff --git a/src/tls.c b/src/tls.c
index 9c6d39dcb..65e03b3e6 100755
--- a/src/tls.c
+++ b/src/tls.c
@@ -5422,7 +5422,7 @@ int TLSX_KeyShare_Establish(WOLFSSL *ssl)
 
     /* Move private key to client entry. */
     if (clientKSE->key != NULL)
-        XFREE(clientKSE->key, heap, DYNAMIC_TYPE_TLSX);
+        XFREE(clientKSE->key, ssl->heap, DYNAMIC_TYPE_TLSX);
     clientKSE->key = serverKSE->key;
     serverKSE->key = NULL;
     clientKSE->keyLen = serverKSE->keyLen;