diff --git a/Terminal.Gui/Views/FileDialog.cs b/Terminal.Gui/Views/FileDialog.cs
index db98d5ee25..1cb916e95d 100644
--- a/Terminal.Gui/Views/FileDialog.cs
+++ b/Terminal.Gui/Views/FileDialog.cs
@@ -729,7 +729,7 @@ public override void OnLoaded ()
 			this.LayoutSubviews ();
 		}
 		/// <summary>
-		/// Gets a default dialog title, when <see cref="Title"/> is not set or empty, 
+		/// Gets a default dialog title, when <see cref="View.Title"/> is not set or empty, 
 		/// result of the function will be shown.
 		/// </summary>
 		protected virtual string GetDefaultTitle ()
diff --git a/Terminal.Gui/Views/FileSystemColorProvider.cs b/Terminal.Gui/Views/FileSystemColorProvider.cs
index 42ae34c9bc..7abeadb695 100644
--- a/Terminal.Gui/Views/FileSystemColorProvider.cs
+++ b/Terminal.Gui/Views/FileSystemColorProvider.cs
@@ -5,11 +5,15 @@
 
 namespace Terminal.Gui {
 
-
+	/// <summary>
+	/// Provides a way to get the color of a file or directory.
+	/// </summary>
 	public class FileSystemColorProvider {
-		
-
-
+		/// <summary>
+		/// Gets the color to use.
+		/// </summary>
+		/// <param name="file"></param>
+		/// <returns></returns>
 		public TrueColor? GetTrueColor (IFileSystemInfo file)
 		{
 			if (FilenameToColor.ContainsKey (file.Name)) {
diff --git a/Terminal.Gui/Views/SaveDialog.cs b/Terminal.Gui/Views/SaveDialog.cs
index e357e704f8..ef3ac36b33 100644
--- a/Terminal.Gui/Views/SaveDialog.cs
+++ b/Terminal.Gui/Views/SaveDialog.cs
@@ -63,6 +63,10 @@ public string FileName {
 			}
 		}
 
+		/// <summary>
+		/// Gets the default title for the <see cref="SaveDialog"/>.
+		/// </summary>
+		/// <returns></returns>
 		protected override string GetDefaultTitle ()
 		{
 			List<string> titleParts = new () {
diff --git a/UnitTests/ConsoleDrivers/AddRuneTests.cs b/UnitTests/ConsoleDrivers/AddRuneTests.cs
index 74246f9a33..5d2e7c5a12 100644
--- a/UnitTests/ConsoleDrivers/AddRuneTests.cs
+++ b/UnitTests/ConsoleDrivers/AddRuneTests.cs
@@ -1,9 +1,7 @@
-//////using Microsoft.VisualStudio.TestPlatform.Utilities;
-using System.Buffers;
+using System.Buffers;
 using System.Text;
 using Xunit;
 using Xunit.Abstractions;
-using static Terminal.Gui.SpinnerStyle;
 
 // Alias Console to MockConsole so we don't accidentally use Console
 
diff --git a/UnitTests/Input/ResponderTests.cs b/UnitTests/Input/ResponderTests.cs
index 36b814202e..d060db42f5 100644
--- a/UnitTests/Input/ResponderTests.cs
+++ b/UnitTests/Input/ResponderTests.cs
@@ -50,7 +50,7 @@ public void Dispose_Works ()
 		
 			var r = new Responder ();
 #if DEBUG_IDISPOSABLE
-			Assert.Equal (1, Responder.Instances.Count);
+			Assert.Single (Responder.Instances);
 #endif
 
 			r.Dispose ();
diff --git a/UnitTests/TestHelpers.cs b/UnitTests/TestHelpers.cs
index 1e46ae74e7..38947e57c2 100644
--- a/UnitTests/TestHelpers.cs
+++ b/UnitTests/TestHelpers.cs
@@ -96,7 +96,7 @@ public override void Before (MethodInfo methodUnderTest)
 #if DEBUG_IDISPOSABLE
 		// Clear out any lingering Responder instances from previous tests
 		Responder.Instances.Clear ();
-		Assert.Equal (0, Responder.Instances.Count);
+		Assert.Empty (Responder.Instances);
 #endif
 	}
 
@@ -104,7 +104,9 @@ public override void After (MethodInfo methodUnderTest)
 	{
 		Debug.WriteLine ($"After: {methodUnderTest.Name}");
 #if DEBUG_IDISPOSABLE
+#pragma warning disable xUnit2013 // Do not use equality check to check for collection size.
 		Assert.Equal (0, Responder.Instances.Count);
+#pragma warning restore xUnit2013 // Do not use equality check to check for collection size.
 #endif
 	}
 }