diff --git a/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java b/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java
index d4799b1b7..f68c062dd 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/ANTLRErrorListener.java
@@ -88,7 +88,7 @@ public interface ANTLRErrorListener {
 	 *
 	 * <p>Each full-context prediction which does not result in a syntax error
 	 * will call either {@link #reportContextSensitivity} or
-	 * {@link reportAmbiguity}.</p>
+	 * {@link #reportAmbiguity}.</p>
 	 *
 	 * <p>When {@code ambigAlts} is not null, it contains the set of potentially
 	 * viable alternatives identified by the prediction algorithm. When
@@ -166,7 +166,7 @@ public interface ANTLRErrorListener {
 	 *
 	 * <p>Each full-context prediction which does not result in a syntax error
 	 * will call either {@link #reportContextSensitivity} or
-	 * {@link reportAmbiguity}.</p>
+	 * {@link #reportAmbiguity}.</p>
 	 *
 	 * <p>For prediction implementations that only evaluate full-context
 	 * predictions when an SLL conflict is found (including the default
diff --git a/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java b/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
index 4e6c16018..2d1c2123b 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/RuntimeMetaData.java
@@ -114,7 +114,7 @@ public class RuntimeMetaData {
 	public interface Listener {
 		/**
 		 * Report a version mismatch which was detected by
-		 * {@link #checkDetails}.
+		 * {@link #checkVersion}.
 		 *
 		 * <p>
 		 * Implementations of this method may, but are not required to, throw
@@ -147,7 +147,7 @@ public class RuntimeMetaData {
 	 */
 	public static class DefaultListener implements Listener {
 		/**
-		 * A default instance of {@link ConsoleListener} which is automatically
+		 * A default instance of {@link DefaultListener} which is automatically
 		 * registered to receive version mismatch events.
 		 */
 		public static final DefaultListener INSTANCE = new DefaultListener();
diff --git a/runtime/Java/src/org/antlr/v4/runtime/atn/DecisionInfo.java b/runtime/Java/src/org/antlr/v4/runtime/atn/DecisionInfo.java
index b9455b1f2..09dd0163d 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/atn/DecisionInfo.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/atn/DecisionInfo.java
@@ -91,7 +91,7 @@ public class DecisionInfo {
 	public long SLL_MaxLook;
 	/**
 	 * Gets the {@link LookaheadEventInfo} associated with the event where the
-	 * {@link #sllMaxLook} value was set.
+	 * {@link #SLL_MaxLook} value was set.
 	 */
 	public LookaheadEventInfo SLL_MaxLookEvent;
 
diff --git a/runtime/Java/src/org/antlr/v4/runtime/misc/IntSet.java b/runtime/Java/src/org/antlr/v4/runtime/misc/IntSet.java
index 86a9a09c0..1f866f582 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/misc/IntSet.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/misc/IntSet.java
@@ -30,6 +30,8 @@
 package org.antlr.v4.runtime.misc;
 
 
+import org.antlr.v4.runtime.Token;
+
 import java.util.List;
 
 /**
@@ -121,7 +123,7 @@ public interface IntSet {
 	 * <li>{@code x.complement(y)}</li>
 	 * </ul>
 	 *
-	 * @param elements The set to compare with the current set. A {@code null}
+	 * @param a The set to compare with the current set. A {@code null}
 	 * argument is treated as though it were an empty set.
 	 * @return A new {@link IntSet} instance containing the elements present in
 	 * {@code elements} but not present in the current set. The value
diff --git a/runtime/Java/src/org/antlr/v4/runtime/misc/IntervalSet.java b/runtime/Java/src/org/antlr/v4/runtime/misc/IntervalSet.java
index 17842e23e..3e19cebb7 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/misc/IntervalSet.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/misc/IntervalSet.java
@@ -208,7 +208,7 @@ public class IntervalSet implements IntSet {
         return this.complement(IntervalSet.of(minElement,maxElement));
     }
 
-    /** {@inheritDoc */
+    /** {@inheritDoc} */
     @Override
     public IntervalSet complement(IntSet vocabulary) {
 		if ( vocabulary==null || vocabulary.isNil() ) {