diff --git a/jetty-core/jetty-server/pom.xml b/jetty-core/jetty-server/pom.xml
index f56519e809f..f17f079a74e 100644
--- a/jetty-core/jetty-server/pom.xml
+++ b/jetty-core/jetty-server/pom.xml
@@ -49,11 +49,6 @@
       <artifactId>jetty-slf4j-impl</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-slf4j-impl</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util-ajax</artifactId>
diff --git a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
index 3344f065d25..374700221ef 100644
--- a/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
+++ b/jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Handler.java
@@ -221,7 +221,7 @@ default <T extends Handler.Container> T getContainer(Handler handler, Class<T> t
     /**
      * <p>A {@link Handler.Container} that can contain multiple other {@link Handler}s.</p>
      *
-     * @see Sequence for an implementation of {@link Collection}.
+     * @see Sequence for an implementation of {@code Collection}.
      * @see Singleton
      */
     interface Collection extends Container
@@ -290,7 +290,7 @@ default void setHandlers(Handler... handlers)
      * <p>This is a "singleton" in the sense of {@link Collections#singleton(Object)} and not
      * in the sense of the singleton pattern of a single instance per JVM.</p>
      *
-     * @see Wrapper for an implementation of {@link Singleton}.
+     * @see Wrapper for an implementation of {@code Singleton}.
      * @see Collection
      */
     @ManagedObject
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/CharsetStringBuilder.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/CharsetStringBuilder.java
index 0959e740620..8b4dd9e89fd 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/CharsetStringBuilder.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/CharsetStringBuilder.java
@@ -32,7 +32,7 @@
  * <p>Any coding errors in the string will be reported by a {@link CharacterCodingException} thrown
  * from the {@link #build()} method.</p>
  * @see Utf8StringBuilder for UTF-8 decoding with replacement of coding errors and/or fast fail behaviour.
- * @see CharsetDecoder for decoding arbitrary {@link Charset}s with control over {@link CodingErrorAction}.
+ * @see CharsetDecoder for decoding arbitrary {@code Charset}s with control over {@code CodingErrorAction}.
  */
 public interface CharsetStringBuilder
 {
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java
index bd385193f8e..175c22719bb 100644
--- a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java
+++ b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/Utf8StringBuilder.java
@@ -37,7 +37,7 @@
  * {@link CharacterCodingException}. Already decoded characters may also be appended (e.g. {@link #append(char)}
  * making this class suitable for decoding % encoded strings of already decoded characters.
  * </p>
- * @see CharsetStringBuilder for decoding of arbitrary {@link java.nio.charset.Charset}s.
+ * @see CharsetStringBuilder for decoding of arbitrary {@code Charset}s.
  */
 public class Utf8StringBuilder implements CharsetStringBuilder
 {