diff --git a/Configure b/Configure
index 73890dde..62de7ee0 100755
--- a/Configure
+++ b/Configure
@@ -483,7 +483,7 @@ our %disabled = ( # "what"         => "comment"
 		  "skfeng"              => "default",
 		  "sdfeng"              => "default",
 		  "gmieng"              => "default",
-		  "gmtls"               => "default",
+		  #"gmtls"               => "default",
 		);
 
 # Note: => pair form used for aesthetics, not to truly make a hash table
diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index f72def01..e5caa478 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2898,7 +2898,7 @@ CERT_PKEY *ssl_get_server_send_pkey_ex(SSL *s)
     if (i < 0)
         return NULL;
 
-    if (i == SSL_PKEY_SM2_SIGN) {
+    if (i == SSL_PKEY_SM2) {
         i = SSL_PKEY_SM2_ENC;
     }
 
diff --git a/ssl/statem/statem_srvr.c b/ssl/statem/statem_srvr.c
index 1bcbb569..831a75aa 100644
--- a/ssl/statem/statem_srvr.c
+++ b/ssl/statem/statem_srvr.c
@@ -690,14 +690,14 @@ int ossl_statem_server_construct_message(SSL *s)
     case TLS_ST_SW_CERT:
 #ifndef OPENSSL_NO_GMTLS
         if (SSL_IS_GMTLS(s))
-            return tls_construct_server_certificate(s)
+            return tls_construct_server_certificate(s);
 #endif
         return tls_construct_server_certificate(s);
 
     case TLS_ST_SW_KEY_EXCH:
 #ifndef OPENSSL_NO_GMTLS
         if (SSL_IS_GMTLS(s))
-            return gmtls_construct_server_key_exchange(s)
+            return gmtls_construct_server_key_exchange(s);
 #endif
         return tls_construct_server_key_exchange(s);