diff --git a/Perspex.Base/Perspex.Base.csproj b/Perspex.Base/Perspex.Base.csproj
index 9603bdf991..48a0db4c96 100644
--- a/Perspex.Base/Perspex.Base.csproj
+++ b/Perspex.Base/Perspex.Base.csproj
@@ -67,6 +67,7 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets" Condition="Exists('..\packages\StyleCop.MSBuild.4.7.49.0\build\StyleCop.MSBuild.Targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
diff --git a/Perspex.Base/PerspexObject.cs b/Perspex.Base/PerspexObject.cs
index 1cc3e4a65e..1a8fbce390 100644
--- a/Perspex.Base/PerspexObject.cs
+++ b/Perspex.Base/PerspexObject.cs
@@ -13,7 +13,6 @@ namespace Perspex
     using System.Reflection;
     using Splat;
 
-
     /// <summary>
     /// The priority of a binding.
     /// </summary>
@@ -451,7 +450,7 @@ namespace Perspex
                 v = this.CreatePriorityValue(property);
                 this.values.Add(property, v);
             }
-
+            
             this.Log().Debug(string.Format(
                 "Set local value of {0}.{1} (#{2:x8}) to {3}",
                 this.GetType().Name,
diff --git a/Perspex.Controls/ContentPresenter.cs b/Perspex.Controls/ContentPresenter.cs
index c852efb0ed..c703ebe14a 100644
--- a/Perspex.Controls/ContentPresenter.cs
+++ b/Perspex.Controls/ContentPresenter.cs
@@ -7,11 +7,9 @@
 namespace Perspex.Controls
 {
     using System;
-    using System.Collections.Generic;
     using System.Linq;
+    using System.Reactive.Linq;
     using Perspex.Layout;
-    using Perspex.Media;
-    using Perspex.Styling;
 
     public class ContentPresenter : Control, IVisual
     {
@@ -23,7 +21,7 @@ namespace Perspex.Controls
 
         public ContentPresenter()
         {
-            this.GetObservableWithHistory(ContentProperty).Subscribe(this.ContentChanged);
+            this.GetObservable(ContentProperty).Skip(1).Subscribe(this.ContentChanged);
         }
 
         public object Content
@@ -136,7 +134,7 @@ namespace Perspex.Controls
             return new Size();
         }
 
-        private void ContentChanged(Tuple<object, object> content)
+        private void ContentChanged(object content)
         {
             this.ClearVisualChildren();
             this.CreateVisualChildren();
diff --git a/Perspex.Layout/LayoutManager.cs b/Perspex.Layout/LayoutManager.cs
index 559006ad82..478e07f94e 100644
--- a/Perspex.Layout/LayoutManager.cs
+++ b/Perspex.Layout/LayoutManager.cs
@@ -37,8 +37,6 @@ namespace Perspex.Layout
                 this.root.Measure(this.root.ClientSize);
                 this.root.Arrange(new Rect(this.root.ClientSize));
             }
-
-            this.root = null;
         }
 
         public void InvalidateMeasure(ILayoutable item)