diff --git a/Source/NotifyIconWpf/Interop/IconDataMembers.cs b/Source/NotifyIconWpf/Interop/IconDataMembers.cs
index 071d087..75b05cf 100644
--- a/Source/NotifyIconWpf/Interop/IconDataMembers.cs
+++ b/Source/NotifyIconWpf/Interop/IconDataMembers.cs
@@ -40,10 +40,9 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
         /// </summary>
         Info = 0x10,
 
-        /// <summary>
-        /// Internal identifier is set. Reserved, thus commented out.
-        /// </summary>
+        // Internal identifier is set. Reserved, thus commented out.
         //Guid = 0x20,
+
         /// <summary>
         /// Windows Vista (Shell32.dll version 6.0.6) and later. If the ToolTip
         /// cannot be displayed immediately, discard it.<br/>
diff --git a/Source/NotifyIconWpf/Interop/IconState.cs b/Source/NotifyIconWpf/Interop/IconState.cs
index 627eaee..9238dd0 100644
--- a/Source/NotifyIconWpf/Interop/IconState.cs
+++ b/Source/NotifyIconWpf/Interop/IconState.cs
@@ -16,9 +16,7 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
         /// </summary>
         Hidden = 0x01,
 
-        /// <summary>
-        /// The icon is shared - currently not supported, thus commented out.
-        /// </summary>
+        // The icon is shared - currently not supported, thus commented out.
         //Shared = 0x02
     }
 }
\ No newline at end of file
diff --git a/Source/NotifyIconWpf/Interop/Point.cs b/Source/NotifyIconWpf/Interop/Point.cs
index 2c1f5bb..39e3e5e 100644
--- a/Source/NotifyIconWpf/Interop/Point.cs
+++ b/Source/NotifyIconWpf/Interop/Point.cs
@@ -8,7 +8,13 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
     [StructLayout(LayoutKind.Sequential)]
     public struct Point
     {
+        /// <summary>
+        /// X coordinate.
+        /// </summary>
         public int X;
+        /// <summary>
+        /// Y coordinate.
+        /// </summary>
         public int Y;
     }
 }
\ No newline at end of file
diff --git a/Source/NotifyIconWpf/Interop/WindowClass.cs b/Source/NotifyIconWpf/Interop/WindowClass.cs
index c3bc6f4..8757f04 100644
--- a/Source/NotifyIconWpf/Interop/WindowClass.cs
+++ b/Source/NotifyIconWpf/Interop/WindowClass.cs
@@ -17,6 +17,8 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
     [StructLayout(LayoutKind.Sequential)]
     public struct WindowClass
     {
+        #pragma warning disable 1591
+
         public uint style;
         public WindowProcedureHandler lpfnWndProc;
         public int cbClsExtra;
@@ -27,5 +29,7 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
         public IntPtr hbrBackground;
         [MarshalAs(UnmanagedType.LPWStr)] public string lpszMenuName;
         [MarshalAs(UnmanagedType.LPWStr)] public string lpszClassName;
+
+        #pragma warning restore 1591
     }
 }
\ No newline at end of file
diff --git a/Source/NotifyIconWpf/Interop/WindowMessageSink.cs b/Source/NotifyIconWpf/Interop/WindowMessageSink.cs
index b134f88..fc21af9 100644
--- a/Source/NotifyIconWpf/Interop/WindowMessageSink.cs
+++ b/Source/NotifyIconWpf/Interop/WindowMessageSink.cs
@@ -71,7 +71,7 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
 
         /// <summary>
         /// Handle for the message window.
-        /// </summary
+        /// </summary> 
         internal IntPtr MessageWindowHandle { get; private set; }
 
         /// <summary>
@@ -309,8 +309,7 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
         #region Dispose
 
         /// <summary>
-        /// Set to true as soon as <see cref="Dispose"/>
-        /// has been invoked.
+        /// Set to true as soon as <c>Dispose</c> has been invoked.
         /// </summary>
         public bool IsDisposed { get; private set; }
 
diff --git a/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs b/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs
index 3e60352..b0e4bb7 100644
--- a/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs
+++ b/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs
@@ -142,6 +142,9 @@ namespace Hardcodet.Wpf.TaskbarNotification
             = DependencyProperty.RegisterReadOnly("CustomBalloon", typeof (Popup), typeof (TaskbarIcon),
                 new FrameworkPropertyMetadata(null));
 
+        /// <summary>
+        /// Maintains a currently displayed custom balloon.
+        /// </summary>
         public static readonly DependencyProperty CustomBalloonProperty
             = CustomBalloonPropertyKey.DependencyProperty;
 
diff --git a/Source/NotifyIconWpf/TaskbarIcon.cs b/Source/NotifyIconWpf/TaskbarIcon.cs
index a205e0f..0ce67de 100644
--- a/Source/NotifyIconWpf/TaskbarIcon.cs
+++ b/Source/NotifyIconWpf/TaskbarIcon.cs
@@ -514,7 +514,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
         /// <see cref="Popup"/> because there was no way to prevent a
         /// popup from causing cyclic open/close commands if it was
         /// placed under the mouse. ToolTip internally uses a Popup of
-        /// its own, but takes advance of Popup's internal <see cref="Popup.HitTestable"/>
+        /// its own, but takes advance of Popup's internal <see cref="UIElement.IsHitTestVisible"/>
         /// property which prevents this issue.</remarks>
         private void CreateCustomToolTip()
         {
@@ -600,7 +600,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
         /// <see cref="Popup"/> because there was no way to prevent a
         /// popup from causing cyclic open/close commands if it was
         /// placed under the mouse. ToolTip internally uses a Popup of
-        /// its own, but takes advance of Popup's internal <see cref="Popup.HitTestable"/>
+        /// its own, but takes advance of Popup's internal <see cref="UIElement.IsHitTestVisible"/>
         /// property which prevents this issue.</remarks>
         private void CreatePopup()
         {
@@ -986,8 +986,7 @@ namespace Hardcodet.Wpf.TaskbarNotification
         #region Dispose / Exit
 
         /// <summary>
-        /// Set to true as soon as <see cref="Dispose"/>
-        /// has been invoked.
+        /// Set to true as soon as <c>Dispose</c> has been invoked.
         /// </summary>
         public bool IsDisposed { get; private set; }