diff --git a/.gitignore b/.gitignore
index a535f5b7..d4492e41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,9 @@ PresentData/PresentData.args.json
 # Make sure internal source isn't unintentionally committed to public repositories
 IntelPresentMon/PresentMonAPI2/Internal.h
 
+# PMInstallerLib heat output (see PMInstallerLib.wixproj GenerateUciDistFragment)
+IntelPresentMon/PMInstallerLib/Generated/
+
 # Reflector Tool
 Reflector/bin/**
 Reflector/obj/**
diff --git a/IntelPresentMon/ControlLib/uci/.gitignore b/IntelPresentMon/ControlLib/uci/.gitignore
index f8ac450d..4275fd2e 100644
--- a/IntelPresentMon/ControlLib/uci/.gitignore
+++ b/IntelPresentMon/ControlLib/uci/.gitignore
@@ -1,2 +1,3 @@
 dist/
 external/
+external-off/
diff --git a/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj b/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
index fa1280b1..7c0a495c 100644
--- a/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
+++ b/IntelPresentMon/PMInstallerLib/PMInstallerLib.wixproj
@@ -1,5 +1,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <!-- WiX 3.x library output -->
     <OutputType>Library</OutputType>
     <OutputName>PMInstallerLib</OutputName>
@@ -14,10 +16,12 @@
     <!-- Optional: ask lit.exe to embed files into the .wixlib -->
     <BindFiles>true</BindFiles>
     <ProjectGuid>{6478f2f6-92ad-4b1c-a13e-c8cea9125152}</ProjectGuid>
+    <!-- Keep generated authoring under the project dir so Visual Studio can load the wixproj. -->
+    <UciDistFragmentPath>Generated\UciDist.wxs</UciDistFragmentPath>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Library.wxs" />
-    <Compile Include="$(IntermediateOutputPath)\UciDist.wxs" />
+    <Compile Include="$(UciDistFragmentPath)" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PresentMonAPI2\PresentMonAPI2.vcxproj">
@@ -38,8 +42,8 @@
     </ProjectReference>
   </ItemGroup>
   <Target Name="GenerateUciDistFragment" BeforeTargets="Compile">
-    <MakeDir Directories="$(IntermediateOutputPath)" />
-    <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot; -UciSdkDir &quot;$(UciSdkDir)&quot; -OutPath &quot;$(IntermediateOutputPath)\UciDist.wxs&quot;" />
+    <MakeDir Directories="$(MSBuildProjectDirectory)\Generated" />
+    <Exec Command="powershell -NoProfile -ExecutionPolicy Bypass -File &quot;$(MSBuildProjectDirectory)\wix-uci-dist.ps1&quot; -UciSdkDir &quot;$(UciSdkDir)&quot; -OutPath &quot;$(MSBuildProjectDirectory)\$(UciDistFragmentPath)&quot;" />
   </Target>
   <Import Project="$(WixTargetsPath)" />
 </Project>