diff --git a/examples/client/client.c b/examples/client/client.c
index 8c609d427..45264db6d 100644
--- a/examples/client/client.c
+++ b/examples/client/client.c
@@ -1406,8 +1406,8 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
                    " nonblocking yet");
         } else {
             if (wolfSSL_Rehandshake(ssl) != SSL_SUCCESS) {
-                int  err = wolfSSL_get_error(ssl, 0);
                 char buffer[WOLFSSL_MAX_ERROR_SZ];
+                err = wolfSSL_get_error(ssl, 0);
                 printf("err = %d, %s\n", err,
                                 wolfSSL_ERR_error_string(err, buffer));
                 err_sys("wolfSSL_Rehandshake failed");
diff --git a/src/tls.c b/src/tls.c
index 2ffb4af58..d4593ba8f 100644
--- a/src/tls.c
+++ b/src/tls.c
@@ -3077,7 +3077,7 @@ int TLSX_UseSecureRenegotiation(TLSX** extensions, void* heap)
 }
 
 
-#define SCR_FREE_ALL(data) XFREE(data, NULL, DYNAMIC_TYPE_TLSX)
+#define SCR_FREE_ALL(data, heap) XFREE(data, (heap), DYNAMIC_TYPE_TLSX)
 #define SCR_GET_SIZE       TLSX_SecureRenegotiation_GetSize
 #define SCR_WRITE          TLSX_SecureRenegotiation_Write
 #define SCR_PARSE          TLSX_SecureRenegotiation_Parse