diff --git a/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/StandardMetadataService.java b/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/StandardMetadataService.java
index 5bfbdd251..129eb699e 100644
--- a/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/StandardMetadataService.java
+++ b/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/StandardMetadataService.java
@@ -105,8 +105,8 @@ public Attestation getCachedAttestation(String attestationCertificateFingerprint
      *
      * <p>
      * If the certificate chain is not trusted, the method returns an untrusted
-     * attestation populated with transports information found embedded in the
-     * attestation certificate.
+     * attestation populated with {@link Attestation#getTransports() transports}
+     * information found embedded in the attestation certificate.
      * </p>
      *
      * <p>
diff --git a/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/TrustResolver.java b/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/TrustResolver.java
index 5a6b62c0d..105fce61a 100644
--- a/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/TrustResolver.java
+++ b/webauthn-server-attestation/src/main/java/com/yubico/webauthn/attestation/TrustResolver.java
@@ -46,9 +46,9 @@ default Optional<X509Certificate> resolveTrustAnchor(X509Certificate attestation
      * @param attestationCertificate The attestation certificate
      * @param caCertificateChain Zero or more certificates, of which the first
      *          has signed <code>attestationCertificate</code> and each of the
-     *          rest has signed the previous in order
-     * @return A trusted root certificate from which there exists a signature
-     *          path to <code>attestationCertificate</code>, if one exists.
+     *          remaining certificates has signed the certificate preceding it.
+     * @return A trusted root certificate from which there is a signature path
+     *          to <code>attestationCertificate</code>, if one exists.
      */
     Optional<X509Certificate> resolveTrustAnchor(X509Certificate attestationCertificate, List<X509Certificate> caCertificateChain);