diff --git a/Clients/Xamarin.Interactive.Client.Windows/Xamarin.Interactive.Client.Windows.csproj b/Clients/Xamarin.Interactive.Client.Windows/Xamarin.Interactive.Client.Windows.csproj
index 444d20be8..b7253db24 100644
--- a/Clients/Xamarin.Interactive.Client.Windows/Xamarin.Interactive.Client.Windows.csproj
+++ b/Clients/Xamarin.Interactive.Client.Windows/Xamarin.Interactive.Client.Windows.csproj
@@ -94,6 +94,12 @@
     <PackageReference Include="MouseKeyboardActivityMonitor">
       <Version>4.0.5150.10665</Version>
     </PackageReference>
+    <PackageReference Include="WindowsAPICodePack-Core">
+      <Version>1.1.2</Version>
+    </PackageReference>
+    <PackageReference Include="WindowsAPICodePack-Shell">
+      <Version>1.1.1</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <Page Include="App.xaml">
@@ -264,14 +270,6 @@
       <Project>{0fd4b1dd-45a8-4f02-beb0-5881cd512573}</Project>
       <Name>CommonMark.Base</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\External\WindowsAPICodePack\Core\Core.csproj">
-      <Project>{2e1fb0df-f9bb-4909-9f32-2d9d022a8e57}</Project>
-      <Name>Core</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\External\WindowsAPICodePack\Shell\Shell.csproj">
-      <Project>{aa0c00cb-8699-4f37-bfae-40ca87acc06d}</Project>
-      <Name>Shell</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\External\Xamarin.PropertyEditing\Xamarin.PropertyEditing.Windows\Xamarin.PropertyEditing.Windows.csproj">
       <Project>{60af04be-1b6b-411b-bcba-c95eafbd7ac0}</Project>
       <Name>Xamarin.PropertyEditing.Windows</Name>
diff --git a/Clients/Xamarin.Interactive.Client/Workbook/Models/WorkbookPackage.cs b/Clients/Xamarin.Interactive.Client/Workbook/Models/WorkbookPackage.cs
index 0846ce803..da0d35682 100644
--- a/Clients/Xamarin.Interactive.Client/Workbook/Models/WorkbookPackage.cs
+++ b/Clients/Xamarin.Interactive.Client/Workbook/Models/WorkbookPackage.cs
@@ -413,7 +413,7 @@ public void Save (IWorkbookSaveOperation operation)
             LogicalPath = operation.Destination;
             SaveOptions = WorkbookSaveOptions.None;
 
-            if (IndexPage != null && IndexPage.IsUntitled)
+            if (IndexPage != null)
                 IndexPage.Title = LogicalPath.NameWithoutExtension;
 
             if (saveOperation.OnlyPage != null &&
diff --git a/Package/Windows/AgentAppFiles.wxs b/Package/Windows/AgentAppFiles.wxs
index 17d761aae..cccc9389a 100644
--- a/Package/Windows/AgentAppFiles.wxs
+++ b/Package/Windows/AgentAppFiles.wxs
@@ -300,17 +300,18 @@
       <Component Id="WpfAgentApp.System.Xml.XPath.XDocument.dll" Guid="54907165-7367-4BFB-AF25-88BBFE04AE0E">
         <File Id="WpfAgentApp.System.Xml.XPath.XDocument.dll" Source="$(var.WpfAgentAppDirectory)\System.Xml.XPath.XDocument.dll" />
       </Component>
+      <Component Id="WpfAgentApp.Microsoft.WindowsAPICodePack.dll" Guid="DC2BA773-3248-4AF3-ACE8-F9EB248A1A09">
+        <File Id="WpfAgentApp.Microsoft.WindowsAPICodePack.dll" Source="$(var.WpfAgentAppDirectory)\Microsoft.WindowsAPICodePack.dll" />
+      </Component>
     </ComponentGroup>
-
     <?ifdef AndroidSupport ?>
-      <?define AndroidAgentAppDirectory="..\..\_build\$(var.Configuration)\WorkbookApps\Android" ?>
-      <ComponentGroup Id="AndroidAgentAppComponents" Directory="AndroidAgentAppInstallFolder">
-        <Component Id="AndroidAgentApp.apk" Guid="6CD2D3A9-40D7-4583-BDD1-5B4711431381">
-          <File Id="AndroidAgentApp.apk" Source="$(var.AndroidAgentAppDirectory)\com.xamarin.workbook_app_android-Signed.apk" />
-        </Component>
-      </ComponentGroup>
+    <?define AndroidAgentAppDirectory="..\..\_build\$(var.Configuration)\WorkbookApps\Android" ?>
+    <ComponentGroup Id="AndroidAgentAppComponents" Directory="AndroidAgentAppInstallFolder">
+      <Component Id="AndroidAgentApp.apk" Guid="6CD2D3A9-40D7-4583-BDD1-5B4711431381">
+        <File Id="AndroidAgentApp.apk" Source="$(var.AndroidAgentAppDirectory)\com.xamarin.workbook_app_android-Signed.apk" />
+      </Component>
+    </ComponentGroup>
     <?endif?>
-
     <ComponentGroup Id="WorkbookManifestComponents" Directory="AgentAppInstallFolder">
       <Component Id="workbookapps.json" Guid="47A8314B-0E4A-48BD-AA24-84A18AE06291">
         <File Id="workbookapps.json" Source="..\..\_build\$(var.Configuration)\WorkbookApps\workbookapps.json" />
diff --git a/Package/Windows/DotNetCoreAgentAppFiles-win-x86.wxs b/Package/Windows/DotNetCoreAgentAppFiles-win-x86.wxs
index 3ccdbf0d1..cc94c2ea8 100644
--- a/Package/Windows/DotNetCoreAgentAppFiles-win-x86.wxs
+++ b/Package/Windows/DotNetCoreAgentAppFiles-win-x86.wxs
@@ -664,6 +664,12 @@
       <Component Id="DNCAgentAppwinx86.System.Memory.dll" Guid="FDA9A09B-F94B-4509-BAB8-919511A724DF">
         <File Id="DNCAgentAppwinx86.System.Memory.dll" Source="$(var.DotNetCoreAssembliesDir)\System.Memory.dll" />
       </Component>
+      <Component Id="DNCAgentAppwinx86.mscordaccore_x86_x86_4.6.26515.07.dll" Guid="A79CC6CE-1A0A-4FCC-9EE9-B40A26274239">
+        <File Id="DNCAgentAppwinx86.mscordaccore_x86_x86_4.6.26515.07.dll" Source="$(var.DotNetCoreAssembliesDir)\mscordaccore_x86_x86_4.6.26515.07.dll" />
+      </Component>
+      <Component Id="DNCAgentAppwinx86.sos_x86_x86_4.6.26515.07.dll" Guid="B4810B78-BFF9-41CD-98FD-38674A4BB261">
+        <File Id="DNCAgentAppwinx86.sos_x86_x86_4.6.26515.07.dll" Source="$(var.DotNetCoreAssembliesDir)\sos_x86_x86_4.6.26515.07.dll" />
+      </Component>
     </ComponentGroup>
   </Fragment>
 </Wix>
\ No newline at end of file
diff --git a/WorkbookApps/Xamarin.Workbooks.Wpf/Xamarin.Workbooks.Wpf.csproj b/WorkbookApps/Xamarin.Workbooks.Wpf/Xamarin.Workbooks.Wpf.csproj
index 2f07d49c3..06577618f 100644
--- a/WorkbookApps/Xamarin.Workbooks.Wpf/Xamarin.Workbooks.Wpf.csproj
+++ b/WorkbookApps/Xamarin.Workbooks.Wpf/Xamarin.Workbooks.Wpf.csproj
@@ -60,6 +60,9 @@
     <PackageReference Include="System.ValueTuple">
       <Version>4.4.0</Version>
     </PackageReference>
+    <PackageReference Include="WindowsAPICodePack-Core">
+      <Version>1.1.2</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -121,4 +124,4 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="Build.targets" />
-</Project>
+</Project>
\ No newline at end of file