diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/GDBJITInterface.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/GDBJITInterface.java
index 396d80768676..a58573827ab7 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/GDBJITInterface.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/GDBJITInterface.java
@@ -65,7 +65,7 @@ public List<String> getHeaderFiles() {
         }
     }
 
-    private static class IncludeForRuntimeDebugOnly implements BooleanSupplier {
+    private static final class IncludeForRuntimeDebugOnly implements BooleanSupplier {
         @Override
         public boolean getAsBoolean() {
             return SubstrateOptions.RuntimeDebugInfo.getValue();
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SharedDebugInfoProvider.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SharedDebugInfoProvider.java
index 61dc8cff9aff..544ef2ea1127 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SharedDebugInfoProvider.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/debug/SharedDebugInfoProvider.java
@@ -162,9 +162,8 @@
  * which is further composed of:
  * <ul>
  * <li>{@link LeafRange}: A leaf in the {@link CompilationResultFrameTree}.</li>
- * <li>{@link CallRange}: A {@link CompilationResultFrameTree.CallNode CallNode} in the
- * {@link CompilationResultFrameTree}. Represents inlined calls and is therefore itself composed of
- * ranges.</li>
+ * <li>{@link CallRange}: A {@code CallNode} in the {@link CompilationResultFrameTree}. Represents
+ * inlined calls and is therefore itself composed of ranges.</li>
  * </ul>
  * </li>
  * </ul>
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
index bc657c20cf68..15c412e1b62b 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/NativeImageDebugInfoProvider.java
@@ -502,7 +502,7 @@ public boolean isVirtual(SharedMethod method) {
     }
 
     /**
-     * Fetch a methods symbol produced by the {@link BFDNameProvider}
+     * Fetch a methods symbol produced by the {@link BFDNameProvider}.
      * 
      * @param method method to get the symbol name for
      * @return symbol name of the method