diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c
index 934737a..9f55fe7 100644
--- a/library/ssl_tls13_server.c
+++ b/library/ssl_tls13_server.c
@@ -107,8 +107,6 @@
 
     ssl->major_ver = major_ver;
     ssl->minor_ver = minor_ver;
-    ssl->handshake->max_major_ver = ssl->major_ver;
-    ssl->handshake->max_minor_ver = ssl->minor_ver;
     return( 0 );
 }
 
@@ -436,10 +434,6 @@
                           ssl, MBEDTLS_SSL_HS_CLIENT_HELLO,
                           &buf, &buflen ) );
 
-    mbedtls_ssl_tls13_add_hs_hdr_to_checksum( ssl,
-                                              MBEDTLS_SSL_HS_CLIENT_HELLO,
-                                              buflen );
-
     MBEDTLS_SSL_PROC_CHK_NEG( ssl_client_hello_parse( ssl, buf, buf + buflen ) );
     hrr_required = ret;
 
@@ -786,7 +780,8 @@
      * - The entire content of the CH message, if no PSK extension is present
      * - The content up to but excluding the PSK extension, if present.
      */
-    ssl->handshake->update_checksum( ssl, buf, p - buf );
+    mbedtls_ssl_add_hs_msg_to_checksum( ssl, MBEDTLS_SSL_HS_SERVER_HELLO,
+                                        buf, p - buf );
     /*
      * Search for a matching ciphersuite
      */