diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index fa858f8..f7bed58 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -3221,7 +3221,7 @@
 #if defined(MBEDTLS_KEY_EXCHANGE__SOME_NON_PFS__ENABLED)
     const mbedtls_ssl_ciphersuite_t *ciphersuite_info =
                             ssl->transform_negotiate->ciphersuite_info;
-#endif /* MBEDTLS_KEY_EXCHANGE__NON_PFS__ENABLED */
+#endif /* MBEDTLS_KEY_EXCHANGE__SOME_NON_PFS__ENABLED */
 
     MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write server key exchange" ) );
 
@@ -3245,7 +3245,7 @@
         ssl->state++;
         return( 0 );
     }
-#endif /* MBEDTLS_KEY_EXCHANGE__NON_PFS__ENABLED */
+#endif /* MBEDTLS_KEY_EXCHANGE__SOME_NON_PFS__ENABLED */
 
 #if defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED) && \
     defined(MBEDTLS_SSL_ASYNC_PRIVATE_C)
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 8ad3494..256590f 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -7431,7 +7431,7 @@
 {
     if( handshake == NULL )
         return;
-    (void) conf; /*unused in some compile-time configurations*/
+    (void) conf; /* Unused in some compile-time configurations. */
 
 #if defined(MBEDTLS_SSL_PROTO_SSL3) || defined(MBEDTLS_SSL_PROTO_TLS1) || \
     defined(MBEDTLS_SSL_PROTO_TLS1_1)