2 files changed, 3 insertions, 1 deletions

diff --git a/src/wixext/VSCompiler.cs b/src/wixext/VSCompiler.cs
index 8c01cb5b..17b7f7a0 100644
--- a/src/wixext/VSCompiler.cs
+++ b/src/wixext/VSCompiler.cs
@@ -350,7 +350,7 @@ namespace WixToolset.VisualStudio
             if (!this.Messaging.EncounteredError)
             {
                 var row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "HelpFileToNamespace", id);
-                row.Set(1, collectionId);
+                row.Set(1, collectionId.Id);
             }
         }
 
diff --git a/src/wixext/WixToolset.VisualStudio.wixext.csproj b/src/wixext/WixToolset.VisualStudio.wixext.csproj
index e0c4a983..57d5b0c8 100644
--- a/src/wixext/WixToolset.VisualStudio.wixext.csproj
+++ b/src/wixext/WixToolset.VisualStudio.wixext.csproj
@@ -18,7 +18,9 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Data\src\WixToolset.Data\WixToolset.Data.csproj') " />
     <ProjectReference Include="$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj" Condition=" '$(Configuration)' == 'Debug' And Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " />
+
     <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" Condition=" '$(Configuration)' == 'Release' Or !Exists('$(WixToolsetRootFolder)\Extensibility\src\WixToolset.Extensibility\WixToolset.Extensibility.csproj') " PrivateAssets="all" />
   </ItemGroup>