diff --git a/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj b/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj
index f2db494..6e3034f 100644
--- a/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj
+++ b/TimberWinR.UnitTests/TimberWinR.UnitTests.csproj
@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TimberWinR.UnitTests</RootNamespace>
     <AssemblyName>TimberWinR.UnitTests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/TimberWinR.UnitTests/packages.config b/TimberWinR.UnitTests/packages.config
index 22e7fbb..700e7dc 100644
--- a/TimberWinR.UnitTests/packages.config
+++ b/TimberWinR.UnitTests/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" requireReinstallation="True" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/TimberWix/TimberWinR.Wix.wixproj b/TimberWix/TimberWinR.Wix.wixproj
index 8a8d947..a15dfe8 100644
--- a/TimberWix/TimberWinR.Wix.wixproj
+++ b/TimberWix/TimberWinR.Wix.wixproj
@@ -22,8 +22,9 @@
     </WixVariables>
     <CompilerAdditionalOptions>
     </CompilerAdditionalOptions>
-    <LinkerAdditionalOptions>    
+    <LinkerAdditionalOptions>
     </LinkerAdditionalOptions>
+    <SuppressIces>ICE40</SuppressIces>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -51,7 +52,7 @@
     <PreBuildEvent />
   </PropertyGroup>
   <Target Name="BeforeBuild">
-    <!-- Read the version from the to-be-installed .exe -->   
+    <!-- Read the version from the to-be-installed .exe -->
     <GetAssemblyIdentity AssemblyFiles="..\TimberWinR.ServiceHost\bin\$(Configuration)\TimberWinR.ServiceHost.exe">
       <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
     </GetAssemblyIdentity>
@@ -59,14 +60,12 @@
     <CreateProperty Value="%(AsmInfo.Version)">
       <Output TaskParameter="Value" PropertyName="VersionNumber" />
     </CreateProperty>
-
     <!-- Create the WiX preprocessor variable $(var.VersionNumber) -->
     <CreateProperty Value="$(DefineConstants);VersionNumber=$(VersionNumber)">
       <Output TaskParameter="Value" PropertyName="DefineConstants" />
     </CreateProperty>
-
     <!-- Update the MSBuild properties $(TargetName), etc. -->
-    <CreateProperty Value="$(SolutionName)-$(Platform)-$(VersionNumber)">
+    <CreateProperty Value="$(SolutionName)-$(VersionNumber)">
       <Output TaskParameter="Value" PropertyName="TargetName" />
     </CreateProperty>
     <CreateProperty Value="$(TargetName)$(TargetExt)">
@@ -81,27 +80,11 @@
     <CreateProperty Value="$(TargetPdbDir)$(TargetPdbName)">
       <Output TaskParameter="Value" PropertyName="TargetPdbPath" />
     </CreateProperty>
-
     <!-- Update the MSBuild property from which candle.exe args are derived -->
-    <CreateProperty Value="
-    Configuration=$(ConfigurationName);
-    OutDir=$(OutDir);
-    Platform=$(PlatformName);
-    ProjectDir=$(ProjectDir);
-    ProjectExt=$(ProjectExt);
-    ProjectFileName=$(ProjectFileName);
-    ProjectName=$(ProjectName);
-    ProjectPath=$(ProjectPath);
-    TargetDir=$(TargetDir);
-    TargetExt=$(TargetExt);
-    TargetFileName=$(TargetFileName);
-    TargetName=$(TargetName);
-    TargetPath=$(TargetPath);
-  ">
+    <CreateProperty Value="&#xD;&#xA;    Configuration=$(ConfigurationName);&#xD;&#xA;    OutDir=$(OutDir);&#xD;&#xA;    Platform=$(PlatformName);&#xD;&#xA;    ProjectDir=$(ProjectDir);&#xD;&#xA;    ProjectExt=$(ProjectExt);&#xD;&#xA;    ProjectFileName=$(ProjectFileName);&#xD;&#xA;    ProjectName=$(ProjectName);&#xD;&#xA;    ProjectPath=$(ProjectPath);&#xD;&#xA;    TargetDir=$(TargetDir);&#xD;&#xA;    TargetExt=$(TargetExt);&#xD;&#xA;    TargetFileName=$(TargetFileName);&#xD;&#xA;    TargetName=$(TargetName);&#xD;&#xA;    TargetPath=$(TargetPath);&#xD;&#xA;  ">
       <Output TaskParameter="Value" PropertyName="ProjectDefineConstants" />
     </CreateProperty>
   </Target>
-  
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.