diff --git a/Avalonia.sln b/Avalonia.sln
index b940efd76b..ad14483b40 100644
--- a/Avalonia.sln
+++ b/Avalonia.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26127.3
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "src\Avalonia.Base\Avalonia.Base.csproj", "{B09B78D8-9B26-48B0-9149-D64A2F120F3F}"
 EndProject
@@ -169,6 +169,7 @@ Global
 		src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{2f59f3d0-748d-4652-b01e-e0d954756308}*SharedItemsImports = 13
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{3e908f67-5543-4879-a1dc-08eace79b3cd}*SharedItemsImports = 4
+		src\Windows\Avalonia.Win32\Avalonia.Win32.Shared.projitems*{40759a76-d0f2-464e-8000-6ff0f5c4bd7c}*SharedItemsImports = 4
 		src\Shared\PlatformSupport\PlatformSupport.projitems*{4488ad85-1495-4809-9aa4-ddfe0a48527e}*SharedItemsImports = 4
 		src\Shared\RenderHelpers\RenderHelpers.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4
 		src\Skia\Avalonia.Skia\Avalonia.Skia.projitems*{47be08a7-5985-410b-9ffc-2264b8ea595f}*SharedItemsImports = 4
diff --git a/src/Avalonia.Controls/WindowBase.cs b/src/Avalonia.Controls/WindowBase.cs
index 88c4a0ccb1..07597984c4 100644
--- a/src/Avalonia.Controls/WindowBase.cs
+++ b/src/Avalonia.Controls/WindowBase.cs
@@ -18,7 +18,7 @@ namespace Avalonia.Controls
     /// <remarks>
     /// This class acts as a base for top level windows such as <see cref="Window"/> and
     /// <see cref="PopupRoot"/>. It handles scheduling layout, styling and rendering as well as
-    /// tracking the window <see cref="ClientSize"/> and <see cref="IsActive"/> state.
+    /// tracking the window <see cref="TopLevel.ClientSize"/> and <see cref="IsActive"/> state.
     /// </remarks>
     public class WindowBase : TopLevel
     {
@@ -142,7 +142,7 @@ namespace Avalonia.Controls
 
         /// <summary>
         /// Handles a window position change notification from 
-        /// <see cref="ITopLevelImpl.PositionChanged"/>.
+        /// <see cref="IWindowBaseImpl.PositionChanged"/>.
         /// </summary>
         /// <param name="pos">The window position.</param>
         private void HandlePositionChanged(Point pos)
@@ -151,7 +151,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Handles an activated notification from <see cref="ITopLevelImpl.Activated"/>.
+        /// Handles an activated notification from <see cref="IWindowBaseImpl.Activated"/>.
         /// </summary>
         private void HandleActivated()
         {
@@ -168,7 +168,7 @@ namespace Avalonia.Controls
         }
 
         /// <summary>
-        /// Handles a deactivated notification from <see cref="ITopLevelImpl.Deactivated"/>.
+        /// Handles a deactivated notification from <see cref="IWindowBaseImpl.Deactivated"/>.
         /// </summary>
         private void HandleDeactivated()
         {