diff --git a/include/openssl/pkcs8.h b/include/openssl/pkcs8.h
index 0bdec8cc00..4e68b907a7 100644
--- a/include/openssl/pkcs8.h
+++ b/include/openssl/pkcs8.h
@@ -287,7 +287,7 @@ BSSL_NAMESPACE_END
 #define PKCS8_R_UNSUPPORTED_OPTIONS 132
 #define PKCS8_R_AMBIGUOUS_FRIENDLY_NAME 133
 
-// PKCS12_R_MAC_VERIFY_FAILURE is an error code defined for OpenVPN
+// PKCS12_R_MAC_VERIFY_FAILURE is an error code defined for
 // compatability. It points to our equivalent for this OpenSSL error,
 // |PKCS8_R_INCORRECT_PASSWORD|
 #define PKCS12_R_MAC_VERIFY_FAILURE PKCS8_R_INCORRECT_PASSWORD
diff --git a/include/openssl/rsa.h b/include/openssl/rsa.h
index eaf9f8d7df..ba7f6fa2d3 100644
--- a/include/openssl/rsa.h
+++ b/include/openssl/rsa.h
@@ -936,7 +936,7 @@ BSSL_NAMESPACE_END
 #define RSA_R_MISMATCHED_SIGNATURE 248
 
 // RSA_F_RSA_OSSL_PRIVATE_ENCRYPT is a function code defined
-// for OpenVPN compatibility, AWS-LC does not support them
+// for compatibility. AWS-LC does not support function codes
 #define RSA_F_RSA_OSSL_PRIVATE_ENCRYPT 0
 
 #endif  // OPENSSL_HEADER_RSA_H
diff --git a/include/openssl/ssl.h b/include/openssl/ssl.h
index f0f104bc56..779bbad810 100644
--- a/include/openssl/ssl.h
+++ b/include/openssl/ssl.h
@@ -4895,13 +4895,13 @@ OPENSSL_EXPORT int SSL_get_shutdown(const SSL *ssl);
 // peer. If not applicable, it returns zero.
 OPENSSL_EXPORT uint16_t SSL_get_peer_signature_algorithm(const SSL *ssl);
 
-// SSL_get_peer_signature_nid sets *psig_nid to the NID of the digest used by
-// the peer to sign TLS messages. Returns 1 on success and 0 on failure.
+// SSL_get_peer_signature_nid sets |psig_nid| to the NID of the digest used by
+// the peer to sign TLS messages. Returns one on success and zero on failure.
 OPENSSL_EXPORT int SSL_get_peer_signature_nid(const SSL *ssl, int *psig_nid);
 
-// SSL_get_peer_signature_type_nid sets *psigtype_nid to the signature type
+// SSL_get_peer_signature_type_nid sets |psigtype_nid| to the signature type
 // used by the peer to sign TLS messages. The signature type is the NID of the
-// public key type used for signing. Returns 1 on success and 0 on failure.
+// public key type used for signing. Returns one on success and zero on failure.
 OPENSSL_EXPORT int SSL_get_peer_signature_type_nid(const SSL *ssl,
                                                    int *psigtype_nid);
 
diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc
index dcd83aac74..abe27d2574 100644
--- a/ssl/ssl_lib.cc
+++ b/ssl/ssl_lib.cc
@@ -3054,7 +3054,7 @@ int SSL_get_peer_signature_nid(const SSL *ssl, int *psig_nid) {
   }
 
   const EVP_MD *digest_type = SSL_get_signature_algorithm_digest(sig_alg);
-  if (digest_type == nullptr) {
+  if (digest_type == NULL) {
     return 0;
   }