diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c
index f8779a0..2a62dc6 100644
--- a/library/ssl_tls13_client.c
+++ b/library/ssl_tls13_client.c
@@ -164,8 +164,8 @@
         ciphersuite_info = mbedtls_ssl_ciphersuite_from_id( cipher_suite );
         if( ciphersuite_info == NULL )
             continue;
-        if( !( MBEDTLS_SSL_MINOR_VERSION_4 > ciphersuite_info->min_minor_ver &&
-               MBEDTLS_SSL_MINOR_VERSION_4 < ciphersuite_info->max_minor_ver ) )
+        if( !( MBEDTLS_SSL_MINOR_VERSION_4 >= ciphersuite_info->min_minor_ver &&
+               MBEDTLS_SSL_MINOR_VERSION_4 <= ciphersuite_info->max_minor_ver ) )
             continue;
 
         MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, add ciphersuite: %04x, %s",
@@ -259,7 +259,7 @@
 
     /* Write cipher_suites */
     ret = ssl_tls13_write_client_hello_cipher_suites( ssl, buf, end, &output_len );
-    if( ret != 0)
+    if( ret != 0 )
         return( ret );
     buf += output_len;
 
diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c
index 3c49a37..ca4c167 100644
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@@ -53,10 +53,12 @@
                                             size_t msg_len )
 {
     int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
+    size_t msg_len_with_header;
     ((void) buf_len);
 
     /* Add reserved 4 bytes for handshake header */
-    ssl->out_msglen = msg_len + 4;
+    msg_len_with_header = msg_len + 4;
+    ssl->out_msglen = msg_len_with_header;
     MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_write_handshake_msg_ext( ssl, 0 ) );
 
 cleanup: