diff --git a/library/ssl_client.c b/library/ssl_client.c
index b226caffff..0f0ea1dc52 100644
--- a/library/ssl_client.c
+++ b/library/ssl_client.c
@@ -676,7 +676,7 @@ static int ssl_write_client_hello_body( mbedtls_ssl_context *ssl,
 
 #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
     MBEDTLS_SSL_PRINT_EXTS(
-        3, MBEDTLS_SSL_HS_CLIENT_HELLO, ssl->handshake->sent_extensions );
+        3, MBEDTLS_SSL_HS_CLIENT_HELLO, handshake->sent_extensions );
 #endif
 
     *out_len = p - buf;
diff --git a/library/ssl_debug_helpers.h b/library/ssl_debug_helpers.h
index ccdda2a0d6..4412f8e213 100644
--- a/library/ssl_debug_helpers.h
+++ b/library/ssl_debug_helpers.h
@@ -55,9 +55,9 @@ void mbedtls_ssl_print_extension( const mbedtls_ssl_context *ssl,
                                   int hs_msg_type, unsigned int extension_type,
                                   const char *extra_msg0, const char *extra_msg1 );
 
-#define MBEDTLS_SSL_PRINT_EXTS( level, hs_msg_type, extension_mask )            \
+#define MBEDTLS_SSL_PRINT_EXTS( level, hs_msg_type, extensions_mask )            \
             mbedtls_ssl_print_extensions( ssl, level, __FILE__, __LINE__,       \
-                                          hs_msg_type, extension_mask, NULL )
+                                          hs_msg_type, extensions_mask, NULL )
 
 #define MBEDTLS_SSL_PRINT_EXT( level, hs_msg_type, extension_type, extra )      \
             mbedtls_ssl_print_extension( ssl, level, __FILE__, __LINE__,        \
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index ea8464f0c8..20648a1667 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -754,7 +754,7 @@ void mbedtls_ssl_print_extensions( const mbedtls_ssl_context *ssl,
     {
         mbedtls_ssl_print_extension(
             ssl, level, file, line, hs_msg_type, extension_type_table[i],
-            extensions_mask & ( 1 << i ) ? "exists" : "does not exists", extra );
+            extensions_mask & ( 1 << i ) ? "exists" : "does not exist", extra );
     }
 }
 
diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index 364e886bca..9940a0e5ea 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -1742,8 +1742,7 @@ static int ssl_tls13_parse_server_hello( mbedtls_ssl_context *ssl,
         p += extension_data_len;
     }
 
-    MBEDTLS_SSL_PRINT_EXTS(
-        3, hs_msg_type, ssl->handshake->received_extensions );
+    MBEDTLS_SSL_PRINT_EXTS( 3, hs_msg_type, handshake->received_extensions );
 
 cleanup:
 
@@ -2036,7 +2035,7 @@ static int ssl_tls13_parse_encrypted_extensions( mbedtls_ssl_context *ssl,
     }
 
     MBEDTLS_SSL_PRINT_EXTS( 3, MBEDTLS_SSL_HS_ENCRYPTED_EXTENSIONS,
-                            ssl->handshake->received_extensions );
+                            handshake->received_extensions );
 
     /* Check that we consumed all the message. */
     if( p != end )
@@ -2225,7 +2224,7 @@ static int ssl_tls13_parse_certificate_request( mbedtls_ssl_context *ssl,
     }
 
     MBEDTLS_SSL_PRINT_EXTS( 3, MBEDTLS_SSL_HS_CERTIFICATE_REQUEST,
-                            ssl->handshake->received_extensions );
+                            handshake->received_extensions );
 
     /* Check that we consumed all the message. */
     if( p != end )
@@ -2517,7 +2516,7 @@ static int ssl_tls13_parse_new_session_ticket_exts( mbedtls_ssl_context *ssl,
     }
 
     MBEDTLS_SSL_PRINT_EXTS( 3, MBEDTLS_SSL_HS_NEW_SESSION_TICKET,
-                            ssl->handshake->received_extensions );
+                            handshake->received_extensions );
 
     return( 0 );
 }
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index a39949c1cd..f854998893 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -547,7 +547,7 @@ int mbedtls_ssl_tls13_parse_certificate( mbedtls_ssl_context *ssl,
         }
 
         MBEDTLS_SSL_PRINT_EXTS( 3, MBEDTLS_SSL_HS_CERTIFICATE,
-                                ssl->handshake->received_extensions );
+                                handshake->received_extensions );
     }
 
 exit:
diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 597fbb7e63..3cd03108f6 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -1624,7 +1624,7 @@ static int ssl_tls13_parse_client_hello( mbedtls_ssl_context *ssl,
     }
 
     MBEDTLS_SSL_PRINT_EXTS( 3, MBEDTLS_SSL_HS_CLIENT_HELLO,
-                            ssl->handshake->received_extensions );
+                            handshake->received_extensions );
 
     mbedtls_ssl_add_hs_hdr_to_checksum( ssl,
                                         MBEDTLS_SSL_HS_CLIENT_HELLO,
diff --git a/tests/opt-testcases/tls13-kex-modes.sh b/tests/opt-testcases/tls13-kex-modes.sh
index 2681f61f17..974d513d8e 100755
--- a/tests/opt-testcases/tls13-kex-modes.sh
+++ b/tests/opt-testcases/tls13-kex-modes.sh
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-# DO NOT ADD NEW TEST CASES INTO THIS FILE. The left cases can be generated by
+# DO NOT ADD NEW TEST CASES INTO THIS FILE. The left cases will be generated by
 # scripts in future(#6280)
 
 requires_gnutls_tls1_3