diff --git a/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.addin b/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.addin
index d05b1f1ce6..d5c5cfb9d8 100644
--- a/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.addin
+++ b/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.addin
@@ -9,6 +9,7 @@
 	</Manifest>
 	
 	<Runtime>
+		<Import assembly = "TreeMaps.dll"/>
 		<Import assembly = "CodeQualityAnalysis.exe"/>
 	</Runtime>
 
diff --git a/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj b/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj
index 0206ac53ba..a017dba8b0 100644
--- a/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj
+++ b/src/AddIns/Analysis/CodeQuality/CodeQualityAnalysis.csproj
@@ -259,10 +259,6 @@
       <Project>{3ED2897F-1A8A-4106-89D2-4D342860D480}</Project>
       <Name>TreeMaps</Name>
     </ProjectReference>
-    <ProjectReference Include="TreeMaps\TreeMaps.csproj">
-      <Project>{3ED2897F-1A8A-4106-89D2-4D342860D480}</Project>
-      <Name>TreeMaps</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Content Include="CodeQualityAnalysis.addin">
diff --git a/src/AddIns/Analysis/CodeQuality/TreeMaps/TreeMaps.csproj b/src/AddIns/Analysis/CodeQuality/TreeMaps/TreeMaps.csproj
index 317c828d38..4e9196f588 100644
--- a/src/AddIns/Analysis/CodeQuality/TreeMaps/TreeMaps.csproj
+++ b/src/AddIns/Analysis/CodeQuality/TreeMaps/TreeMaps.csproj
@@ -23,16 +23,17 @@
     <IsWebBootstrapper>true</IsWebBootstrapper>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <PublishUrl>Publish\</PublishUrl>
-    <StartupObject>
-    </StartupObject>
     <TargetFrameworkProfile />
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
+    <NoStdLib>False</NoStdLib>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+    <DebugType>Full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>.\bin\Debug\</OutputPath>
+    <OutputPath>..\..\..\..\AddIns\Analysis\CodeQualityAnalysis\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -41,6 +42,16 @@
     <OutputPath>.\bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Platform)' == 'AnyCPU' ">
+    <RegisterForComInterop>False</RegisterForComInterop>
+    <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
+    <BaseAddress>4194304</BaseAddress>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <FileAlignment>4096</FileAlignment>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="mscorlib" />
     <Reference Include="System" />