diff --git a/api-extractor.json b/api-extractor.json
index 6c599d255..66414503a 100644
--- a/api-extractor.json
+++ b/api-extractor.json
@@ -352,6 +352,11 @@
       // Needs investigation.
       "ae-forgotten-export": {
         "logLevel": "none"
+      },
+
+      // We don't prefix our internal APIs with underscores.
+      "ae-internal-missing-underscore": {
+        "logLevel": "none"
       }
     },
 
diff --git a/core/block.ts b/core/block.ts
index 9c68bc4cd..b5eff8311 100644
--- a/core/block.ts
+++ b/core/block.ts
@@ -1411,7 +1411,7 @@ export class Block implements IASTNodeLocation {
     return this.disabledReasons.size === 0;
   }
 
-  /** @deprecated v11 - Get whether the block is manually disabled. */
+  /** @deprecated v11 - Get or sets whether the block is manually disabled. */
   private get disabled(): boolean {
     deprecation.warn(
       'disabled',
@@ -1422,7 +1422,6 @@ export class Block implements IASTNodeLocation {
     return this.hasDisabledReason(constants.MANUALLY_DISABLED);
   }
 
-  /** @deprecated v11 - Set whether the block is manually disabled. */
   private set disabled(value: boolean) {
     deprecation.warn(
       'disabled',
@@ -2519,7 +2518,7 @@ export class Block implements IASTNodeLocation {
    *
    * Intended to on be used in console logs and errors. If you need a string
    * that uses the user's native language (including block text, field values,
-   * and child blocks), use [toString()]{@link Block#toString}.
+   * and child blocks), use {@link (Block:class).toString | toString()}.
    *
    * @returns The description.
    */
diff --git a/core/connection.ts b/core/connection.ts
index 9cc2c28a9..039d8822c 100644
--- a/core/connection.ts
+++ b/core/connection.ts
@@ -485,7 +485,7 @@ export class Connection implements IASTNodeLocationWithBlock {
    *
    * Headless configurations (the default) do not have neighboring connection,
    * and always return an empty list (the default).
-   * {@link RenderedConnection#neighbours} overrides this behavior with a list
+   * {@link (RenderedConnection:class).neighbours} overrides this behavior with a list
    * computed from the rendered positioning.
    *
    * @param _maxLimit The maximum radius to another connection.
diff --git a/core/events/events_var_delete.ts b/core/events/events_var_delete.ts
index 8663eb398..225459c44 100644
--- a/core/events/events_var_delete.ts
+++ b/core/events/events_var_delete.ts
@@ -18,8 +18,6 @@ import {EventType} from './type.js';
 
 /**
  * Notifies listeners that a variable model has been deleted.
- *
- * @class
  */
 export class VarDelete extends VarBase {
   override type = EventType.VAR_DELETE;
diff --git a/core/events/events_var_rename.ts b/core/events/events_var_rename.ts
index 26c272c7b..23a0a17cd 100644
--- a/core/events/events_var_rename.ts
+++ b/core/events/events_var_rename.ts
@@ -18,8 +18,6 @@ import {EventType} from './type.js';
 
 /**
  * Notifies listeners that a variable model was renamed.
- *
- * @class
  */
 export class VarRename extends VarBase {
   override type = EventType.VAR_RENAME;
diff --git a/core/interfaces/i_metrics_manager.ts b/core/interfaces/i_metrics_manager.ts
index bb4d54da4..6fc0d080c 100644
--- a/core/interfaces/i_metrics_manager.ts
+++ b/core/interfaces/i_metrics_manager.ts
@@ -63,7 +63,7 @@ export interface IMetricsManager {
    * Gets the width, height and position of the toolbox on the workspace in
    * pixel coordinates. Returns 0 for the width and height if the workspace has
    * a simple toolbox instead of a category toolbox. To get the width and height
-   * of a simple toolbox, see {@link IMetricsManager#getFlyoutMetrics}.
+   * of a simple toolbox, see {@link IMetricsManager.getFlyoutMetrics}.
    *
    * @returns The object with the width, height and position of the toolbox.
    */
diff --git a/core/interfaces/i_rendered_element.ts b/core/interfaces/i_rendered_element.ts
index 7e6981ca6..fe9460c7f 100644
--- a/core/interfaces/i_rendered_element.ts
+++ b/core/interfaces/i_rendered_element.ts
@@ -4,18 +4,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/** @internal */
 export interface IRenderedElement {
   /**
-   * @returns The root SVG element of htis rendered element.
+   * @returns The root SVG element of this rendered element.
    */
   getSvgRoot(): SVGElement;
 }
 
 /**
  * @returns True if the given object is an IRenderedElement.
- *
- * @internal
  */
 export function isRenderedElement(obj: any): obj is IRenderedElement {
   return obj['getSvgRoot'] !== undefined;
diff --git a/core/menu.ts b/core/menu.ts
index f01c1edfb..ec9aae571 100644
--- a/core/menu.ts
+++ b/core/menu.ts
@@ -389,9 +389,7 @@ export class Menu {
   // Keyboard events.
 
   /**
-   * Attempts to handle a keyboard event, if the menu item is enabled, by
-   * calling
-   * {@link Menu#handleKeyEventInternal_}.
+   * Attempts to handle a keyboard event.
    *
    * @param e Key event to handle.
    */
diff --git a/core/metrics_manager.ts b/core/metrics_manager.ts
index 62a2614b6..a8470462c 100644
--- a/core/metrics_manager.ts
+++ b/core/metrics_manager.ts
@@ -76,7 +76,7 @@ export class MetricsManager implements IMetricsManager {
    * Gets the width, height and position of the toolbox on the workspace in
    * pixel coordinates. Returns 0 for the width and height if the workspace has
    * a simple toolbox instead of a category toolbox. To get the width and height
-   * of a simple toolbox, see {@link MetricsManager#getFlyoutMetrics}.
+   * of a simple toolbox, see {@link (MetricsManager:class).getFlyoutMetrics}.
    *
    * @returns The object with the width, height and position of the toolbox.
    */
diff --git a/core/renderers/common/renderer.ts b/core/renderers/common/renderer.ts
index 01de1f877..812ddd976 100644
--- a/core/renderers/common/renderer.ts
+++ b/core/renderers/common/renderer.ts
@@ -73,7 +73,7 @@ export class Renderer implements IRegistrable {
   /**
    * Create any DOM elements that this renderer needs.
    * If you need to create additional DOM elements, override the
-   * {@link ConstantProvider#createDom} method instead.
+   * {@link blockRendering#ConstantProvider.createDom} method instead.
    *
    * @param svg The root of the workspace's SVG.
    * @param theme The workspace theme object.
diff --git a/core/workspace_svg.ts b/core/workspace_svg.ts
index 68f956b4d..60288573c 100644
--- a/core/workspace_svg.ts
+++ b/core/workspace_svg.ts
@@ -1102,6 +1102,7 @@ export class WorkspaceSvg extends Workspace implements IASTNodeLocationSvg {
 
   /**
    * @returns The layer manager for this workspace.
+   * @internal
    */
   getLayerManager(): LayerManager | null {
     return this.layerManager;