diff --git a/ICD.Common.Utils/Extensions/EnumerableExtensions.cs b/ICD.Common.Utils/Extensions/EnumerableExtensions.cs
index 37ee21d..305708e 100644
--- a/ICD.Common.Utils/Extensions/EnumerableExtensions.cs
+++ b/ICD.Common.Utils/Extensions/EnumerableExtensions.cs
@@ -657,7 +657,7 @@ namespace ICD.Common.Utils.Extensions
 			if (extends == null)
 				throw new ArgumentNullException("extends");
 
-			return extends.Where(e => e.HasValue).Select(e => e.Value);
+			return extends.OfType<T>();
 		}
 
 		/// <summary>
diff --git a/ICD.Common.Utils/IO/IcdTextWriter.cs b/ICD.Common.Utils/IO/IcdTextWriter.cs
index 75e5ed3..8a70a18 100644
--- a/ICD.Common.Utils/IO/IcdTextWriter.cs
+++ b/ICD.Common.Utils/IO/IcdTextWriter.cs
@@ -15,7 +15,7 @@ namespace ICD.Common.Utils.IO
 
 		public TextWriter WrappedTextWriter { get { return m_TextWriter; } }
 
-		private bool disposed = false;
+		private bool m_Disposed;
 
 		/// <summary>
 		/// Constructor.
@@ -42,14 +42,14 @@ namespace ICD.Common.Utils.IO
 
 		protected void Dispose(bool disposing)
 		{
-			if (disposed)
+			if (m_Disposed)
 				return;
 
 			if (disposing)
 			{
 				m_TextWriter.Dispose();
 			}
-			disposed = true;
+			m_Disposed = true;
 		}
 	}
 }
diff --git a/ICD.Common.Utils/IStateDisposable.cs b/ICD.Common.Utils/IStateDisposable.cs
index c8bc713..741c1fa 100644
--- a/ICD.Common.Utils/IStateDisposable.cs
+++ b/ICD.Common.Utils/IStateDisposable.cs
@@ -1,4 +1,5 @@
 using System;
+using ICD.Common.Properties;
 
 namespace ICD.Common.Utils
 {
@@ -10,6 +11,7 @@ namespace ICD.Common.Utils
 		/// <summary>
 		/// Returns true if this instance has been disposed.
 		/// </summary>
+		[PublicAPI]
 		bool IsDisposed { get; }
 	}
 }