diff --git a/Terminal.Gui/View/Adornment/Adornment.cs b/Terminal.Gui/View/Adornment/Adornment.cs
index bc852031b..1062e54bf 100644
--- a/Terminal.Gui/View/Adornment/Adornment.cs
+++ b/Terminal.Gui/View/Adornment/Adornment.cs
@@ -206,7 +206,6 @@ public class Adornment : View
     #region Mouse Support
 
 
-    // TODO: It's stoopid that this override changes the defn of the input coords from base. 
     /// <summary>
     /// Indicates whether the specified Parent's SuperView-relative coordinates are within the Adornment's Thickness.
     /// </summary>
diff --git a/Terminal.Gui/View/View.Diagnostics.cs b/Terminal.Gui/View/View.Diagnostics.cs
index 6e5797e26..e3b22472c 100644
--- a/Terminal.Gui/View/View.Diagnostics.cs
+++ b/Terminal.Gui/View/View.Diagnostics.cs
@@ -20,7 +20,7 @@ public enum ViewDiagnosticFlags : uint
     Padding = 0b_0000_0010,
 
     /// <summary>
-    ///     When enabled, <see cref="Adornment.OnMouseEnter(Gui.MouseEvent)"/> and <see cref="Adornment.OnMouseLeave(Gui.MouseEvent)"/>
+    ///     When enabled, <see cref="Adornment.OnMouseEnter"/> and <see cref="Adornment.OnMouseLeave"/>
     ///     will invert the foreground and background colors.
     /// </summary>
     MouseEnter = 0b_0000_00100
diff --git a/UnitTests/View/Mouse/GetViewsUnderMouseTests.cs b/UnitTests/View/Mouse/GetViewsUnderMouseTests.cs
index 7a58779b2..474dfa687 100644
--- a/UnitTests/View/Mouse/GetViewsUnderMouseTests.cs
+++ b/UnitTests/View/Mouse/GetViewsUnderMouseTests.cs
@@ -795,7 +795,7 @@ public class GetViewsUnderMouseTests
 
         List<View?> found = View.GetViewsUnderMouse (new (mouseX, mouseY));
 
-        string [] foundIds = found.Select (v => v.Id).ToArray ();
+        string [] foundIds = found.Select (v => v!.Id).ToArray ();
 
         Assert.Equal (viewIdStrings, foundIds);