diff --git a/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj b/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj
index 2ebb98a7c..f41d005a1 100644
--- a/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj
+++ b/Mindscape.Raygun4Net.AspNetCore/Mindscape.Raygun4Net.AspNetCore.csproj
@@ -43,6 +43,10 @@
   <ItemGroup>
     <ProjectReference Include="..\Mindscape.Raygun4Net.NetCore.Common\Mindscape.Raygun4Net.NetCore.Common.csproj" />
   </ItemGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
+    <AssemblyOriginatorKeyFile>Raygun4Net.AspNetCore.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <AssemblyOriginatorKeyFile>Raygun4Net.AspNetCore.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
diff --git a/Mindscape.Raygun4Net.Azure.WebJob.nuspec b/Mindscape.Raygun4Net.Azure.WebJob.nuspec
index 0bd650c81..b28f9d374 100644
--- a/Mindscape.Raygun4Net.Azure.WebJob.nuspec
+++ b/Mindscape.Raygun4Net.Azure.WebJob.nuspec
@@ -2,16 +2,16 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.5">
     <id>Mindscape.Raygun4Net.Azure.WebJob</id>
-    <version>5.7.0</version>
+    <version>6.0.2</version>
     <title />
     <authors>Raygun</authors>
     <owners />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Raygun provider for Azure Web Job SDK enabled projects</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
-    <licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
-    <dependencies>
+    <license type="file">LICENSE</license>
+    <icon>128x128-transparent.png</icon>
+   <dependencies>
       <dependency id="Mindscape.Raygun4Net.Core" version="5.6.0" />
       <dependency id="Microsoft.Azure.WebJobs.Extensions" version="2.0.0" />
     </dependencies>
@@ -24,5 +24,7 @@
     <file src="build\webjob\Mindscape.Raygun4Net4.pdb"             target="lib\net40\Mindscape.Raygun4Net4.pdb" />
     
     <file src="Mindscape.Raygun4Net.Azure.WebJob\README.md" />
+    <file src="128x128-transparent.png" />
+    <file src="LICENSE" />
   </files>
 </package>
diff --git a/Mindscape.Raygun4Net.Azure.WebJob/Mindscape.Raygun4Net.Azure.WebJob.csproj b/Mindscape.Raygun4Net.Azure.WebJob/Mindscape.Raygun4Net.Azure.WebJob.csproj
index 8bb485ee9..45710f1bc 100644
--- a/Mindscape.Raygun4Net.Azure.WebJob/Mindscape.Raygun4Net.Azure.WebJob.csproj
+++ b/Mindscape.Raygun4Net.Azure.WebJob/Mindscape.Raygun4Net.Azure.WebJob.csproj
@@ -28,6 +28,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Raygun4Net.Azure.WebJob.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/Mindscape.Raygun4Net.ClientProfile/Mindscape.Raygun4Net.ClientProfile.csproj b/Mindscape.Raygun4Net.ClientProfile/Mindscape.Raygun4Net.ClientProfile.csproj
index 98e983830..2f239dc48 100644
--- a/Mindscape.Raygun4Net.ClientProfile/Mindscape.Raygun4Net.ClientProfile.csproj
+++ b/Mindscape.Raygun4Net.ClientProfile/Mindscape.Raygun4Net.ClientProfile.csproj
@@ -32,7 +32,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>    
+    <AssemblyOriginatorKeyFile>Raygun4Net.ClientProfile.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <AssemblyOriginatorKeyFile>Raygun4Net.ClientProfile.snk</AssemblyOriginatorKeyFile>
diff --git a/Mindscape.Raygun4Net.Common/Mindscape.Raygun4Net.Common.csproj b/Mindscape.Raygun4Net.Common/Mindscape.Raygun4Net.Common.csproj
index eaa50b639..9ac2965c3 100644
--- a/Mindscape.Raygun4Net.Common/Mindscape.Raygun4Net.Common.csproj
+++ b/Mindscape.Raygun4Net.Common/Mindscape.Raygun4Net.Common.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFrameworks>net4;net45</TargetFrameworks>
+    <AssemblyOriginatorKeyFile>Raygun4Net4.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 
   <ItemGroup >
diff --git a/Mindscape.Raygun4Net.Core.Signed.nuspec b/Mindscape.Raygun4Net.Core.Signed.nuspec
index 4bd5a4717..9edae2b33 100644
--- a/Mindscape.Raygun4Net.Core.Signed.nuspec
+++ b/Mindscape.Raygun4Net.Core.Signed.nuspec
@@ -8,12 +8,15 @@
     <owners />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Core library for signed MVC and WebApi Raygun providers</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
-    <licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
-  </metadata>
+    <license type="file">LICENSE</license>
+    <icon>128x128-transparent.png</icon></metadata>
   <files>
     <file src="build\signed\net40\Mindscape.Raygun4Net.dll" target="lib\net40\Mindscape.Raygun4Net.dll" />
     <file src="build\signed\net40\Mindscape.Raygun4Net.pdb" target="lib\net40\Mindscape.Raygun4Net.pdb" />
+ 
+ 
+    <file src="128x128-transparent.png" />
+    <file src="LICENSE" />
   </files>
 </package>
diff --git a/Mindscape.Raygun4Net.Core.nuspec b/Mindscape.Raygun4Net.Core.nuspec
index 8c04f0186..f9225ce86 100644
--- a/Mindscape.Raygun4Net.Core.nuspec
+++ b/Mindscape.Raygun4Net.Core.nuspec
@@ -8,12 +8,15 @@
     <owners />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Core library for MVC and WebApi Raygun providers</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
-    <licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
+    <license type="file">LICENSE</license>
+    <icon>128x128-transparent.png</icon>
   </metadata>
   <files>
     <file src="build\net40\Mindscape.Raygun4Net.dll" target="lib\net40\Mindscape.Raygun4Net.dll" />
     <file src="build\net40\Mindscape.Raygun4Net.pdb" target="lib\net40\Mindscape.Raygun4Net.pdb" />
+  
+    <file src="128x128-transparent.png" />
+    <file src="LICENSE" />
   </files>
 </package>
diff --git a/Mindscape.Raygun4Net.Core/Mindscape.Raygun4Net.Core.csproj b/Mindscape.Raygun4Net.Core/Mindscape.Raygun4Net.Core.csproj
index 56c098752..3c7b1ca47 100644
--- a/Mindscape.Raygun4Net.Core/Mindscape.Raygun4Net.Core.csproj
+++ b/Mindscape.Raygun4Net.Core/Mindscape.Raygun4Net.Core.csproj
@@ -28,6 +28,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <SignAssembly>true</SignAssembly>  
+    <AssemblyOriginatorKeyFile>Raygun4Net.Core.snk</AssemblyOriginatorKeyFile>  
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/Mindscape.Raygun4Net.Mvc.Signed.nuspec b/Mindscape.Raygun4Net.Mvc.Signed.nuspec
index 26ab21cfe..7ef1de1aa 100644
--- a/Mindscape.Raygun4Net.Mvc.Signed.nuspec
+++ b/Mindscape.Raygun4Net.Mvc.Signed.nuspec
@@ -2,16 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.5">
     <id>Mindscape.Raygun4Net.Mvc.Signed</id>
-    <version>6.0.0-beta001</version>
+    <version>6.0.2</version>
     <title />
     <authors>Raygun</authors>
     <owners />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Raygun provider for signed ASP.NET MVC projects</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
-    <licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
-    <dependencies>
+    <license type="file">LICENSE</license>
+    <icon>128x128-transparent.png</icon><dependencies>
       <dependency id="Mindscape.Raygun4Net.Core.Signed" version="5.12.1" />
     </dependencies>
   </metadata>
@@ -23,5 +22,7 @@
     <file src="build\signed\mvc\Mindscape.Raygun4Net4.pdb" target="lib\net40\Mindscape.Raygun4Net4.pdb" />
     
     <file src="Mindscape.Raygun4Net.Mvc\README.md" />
+    <file src="128x128-transparent.png" />
+    <file src="LICENSE" />
   </files>
 </package>
diff --git a/Mindscape.Raygun4Net.Mvc.nuspec b/Mindscape.Raygun4Net.Mvc.nuspec
index 4cd74a2bc..322c8cf4b 100644
--- a/Mindscape.Raygun4Net.Mvc.nuspec
+++ b/Mindscape.Raygun4Net.Mvc.nuspec
@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.5">
     <id>Mindscape.Raygun4Net.Mvc</id>
-    <version>6.0.0-beta001</version>
+    <version>6.0.2</version>
     <title />
     <authors>Raygun</authors>
     <owners />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Raygun provider for ASP.NET MVC projects</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
-    <licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
+    <license type="file">LICENSE</license>
+    <icon>128x128-transparent.png</icon>
     <dependencies>
       <dependency id="Mindscape.Raygun4Net.Core" version="5.12.1" />
     </dependencies>
@@ -21,7 +21,11 @@
     <file src="build\mvc\Mindscape.Raygun4Net.Mvc.pdb" target="lib\net40\Mindscape.Raygun4Net.Mvc.pdb" />
     <file src="build\mvc\Mindscape.Raygun4Net4.dll" target="lib\net40\Mindscape.Raygun4Net4.dll" />
     <file src="build\mvc\Mindscape.Raygun4Net4.pdb" target="lib\net40\Mindscape.Raygun4Net4.pdb" />
+    <file src="build\mvc\Mindscape.Raygun4Net.Common.dll" target="lib\net40\Mindscape.Raygun4Net.Common.dll" />
+    <file src="build\mvc\Mindscape.Raygun4Net.Common.pdb" target="lib\net40\Mindscape.Raygun4Net.Common.pdb" />
     
     <file src="Mindscape.Raygun4Net.Mvc\README.md" />
+    <file src="128x128-transparent.png" />
+    <file src="LICENSE" />
   </files>
 </package>
diff --git a/Mindscape.Raygun4Net.Mvc/Mindscape.Raygun4Net.Mvc.csproj b/Mindscape.Raygun4Net.Mvc/Mindscape.Raygun4Net.Mvc.csproj
index 9a66f8c45..b7c703191 100644
--- a/Mindscape.Raygun4Net.Mvc/Mindscape.Raygun4Net.Mvc.csproj
+++ b/Mindscape.Raygun4Net.Mvc/Mindscape.Raygun4Net.Mvc.csproj
@@ -30,6 +30,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <SignAssembly>true</SignAssembly>    
+    <AssemblyOriginatorKeyFile>Raygun4Net.Mvc.snk</AssemblyOriginatorKeyFile> 
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj b/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj
index 7347c1c8c..d20f503d4 100644
--- a/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj
+++ b/Mindscape.Raygun4Net.NetCore.Common/Mindscape.Raygun4Net.NetCore.Common.csproj
@@ -14,6 +14,8 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageIconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</PackageIconUrl>
     <PackageIcon>128x128-transparent.png</PackageIcon>
+    <AssemblyOriginatorKeyFile>Raygun4Net.NetCore.Common.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <PackageId>Mindscape.Raygun4Net.NetCore.Common.Signed</PackageId>
diff --git a/Mindscape.Raygun4Net.NetCore/Mindscape.Raygun4Net.NetCore.csproj b/Mindscape.Raygun4Net.NetCore/Mindscape.Raygun4Net.NetCore.csproj
index 126e594a7..712d78a34 100644
--- a/Mindscape.Raygun4Net.NetCore/Mindscape.Raygun4Net.NetCore.csproj
+++ b/Mindscape.Raygun4Net.NetCore/Mindscape.Raygun4Net.NetCore.csproj
@@ -29,6 +29,11 @@
     <Compile Include="RaygunSettings.cs" />
     <Compile Include="Properties\*.cs" />
   </ItemGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <AssemblyOriginatorKeyFile>Raygun4Net.NetCore.snk</AssemblyOriginatorKeyFile>
+	  <SignAssembly>true</SignAssembly>
+	  <Optimize>true</Optimize>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <PackageId>Mindscape.Raygun4Net.NetCore.Signed</PackageId>
     <AssemblyOriginatorKeyFile>Raygun4Net.NetCore.snk</AssemblyOriginatorKeyFile>
diff --git a/Mindscape.Raygun4Net.Signed.nuspec b/Mindscape.Raygun4Net.Signed.nuspec
index 72f1d19b5..f43914668 100644
--- a/Mindscape.Raygun4Net.Signed.nuspec
+++ b/Mindscape.Raygun4Net.Signed.nuspec
@@ -2,13 +2,12 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.5">
     <id>Mindscape.Raygun4Net.Signed</id>
-    <version>6.0.1</version>
+    <version>6.0.2</version>
     <title />
     <authors>Raygun</authors>
     <owners />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Raygun provider for signed projects built with .NET Framework</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
     <license type="file">LICENSE</license>
     <icon>128x128-transparent.png</icon>
diff --git a/Mindscape.Raygun4Net.Tests/Mindscape.Raygun4Net.Tests.csproj b/Mindscape.Raygun4Net.Tests/Mindscape.Raygun4Net.Tests.csproj
index 6b8568812..439db3bbc 100644
--- a/Mindscape.Raygun4Net.Tests/Mindscape.Raygun4Net.Tests.csproj
+++ b/Mindscape.Raygun4Net.Tests/Mindscape.Raygun4Net.Tests.csproj
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Mindscape.Raygun4Net.Tests.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>Mindscape.Raygun4Net.Tests.snk</AssemblyOriginatorKeyFile>
diff --git a/Mindscape.Raygun4Net.WebApi.Signed.nuspec b/Mindscape.Raygun4Net.WebApi.Signed.nuspec
index dbb0d64d8..be3a504dc 100644
--- a/Mindscape.Raygun4Net.WebApi.Signed.nuspec
+++ b/Mindscape.Raygun4Net.WebApi.Signed.nuspec
@@ -9,9 +9,9 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>Raygun provider for signed ASP.NET Web API projects</summary>
     <description>Raygun provider for signed ASP.NET Web API projects</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
-    <licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
+    <license type="file">LICENSE</license>
+    <icon>128x128-transparent.png</icon>
     <dependencies>
       <dependency id="Mindscape.Raygun4Net.Core.Signed" version="5.12.1" />
     </dependencies>
@@ -21,5 +21,7 @@
     <file src="build\signed\webapi\Mindscape.Raygun4Net.WebApi.pdb" target="lib\net45\Mindscape.Raygun4Net.WebApi.pdb" />
     
     <file src="Mindscape.Raygun4Net.WebApi\README.md" />
+    <file src="128x128-transparent.png" />
+    <file src="LICENSE" />
   </files>
 </package>
diff --git a/Mindscape.Raygun4Net.WebApi.Tests/Mindscape.Raygun4Net.WebApi.Tests.csproj b/Mindscape.Raygun4Net.WebApi.Tests/Mindscape.Raygun4Net.WebApi.Tests.csproj
index 70c0dd80e..d069a122b 100644
--- a/Mindscape.Raygun4Net.WebApi.Tests/Mindscape.Raygun4Net.WebApi.Tests.csproj
+++ b/Mindscape.Raygun4Net.WebApi.Tests/Mindscape.Raygun4Net.WebApi.Tests.csproj
@@ -70,9 +70,7 @@
       <Name>Mindscape.Raygun4Net.WebApi</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Payloads\" />
-  </ItemGroup>
+  <ItemGroup />
   <ItemGroup>
     <EmbeddedResource Include="Payloads\AttributedWithoutValues.xml" />
     <EmbeddedResource Include="Payloads\AttributedWithValues.xml" />
diff --git a/Mindscape.Raygun4Net.WebApi.nuspec b/Mindscape.Raygun4Net.WebApi.nuspec
index f9d3fadb7..26c3aeca7 100644
--- a/Mindscape.Raygun4Net.WebApi.nuspec
+++ b/Mindscape.Raygun4Net.WebApi.nuspec
@@ -9,9 +9,9 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <summary>Raygun provider for ASP.NET Web API projects</summary>
     <description>Raygun provider for ASP.NET Web API projects</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
-    <licenseUrl>https://raw.github.com/MindscapeHQ/raygun4net/master/LICENSE</licenseUrl>
+    <license type="file">LICENSE</license>
+    <icon>128x128-transparent.png</icon> 
     <dependencies>
       <dependency id="Mindscape.Raygun4Net.Core" version="5.12.1" />
     </dependencies>
@@ -21,5 +21,7 @@
     <file src="build\webapi\Mindscape.Raygun4Net.WebApi.pdb" target="lib\net45\Mindscape.Raygun4Net.WebApi.pdb" />
     
     <file src="Mindscape.Raygun4Net.WebApi\README.md" />
+    <file src="128x128-transparent.png" />
+    <file src="LICENSE" />
   </files>
 </package>
diff --git a/Mindscape.Raygun4Net.WebApi.sln b/Mindscape.Raygun4Net.WebApi.sln
index 3010095a8..7de5d7515 100644
--- a/Mindscape.Raygun4Net.WebApi.sln
+++ b/Mindscape.Raygun4Net.WebApi.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio Version 17
+VisualStudioVersion = 17.6.33626.354
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mindscape.Raygun4Net.WebApi", "Mindscape.Raygun4Net.WebApi\Mindscape.Raygun4Net.WebApi.csproj", "{5F72C401-B09D-46C4-873B-65F1B4B1AE09}"
 EndProject
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mindscape.Raygun4Net.Core",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mindscape.Raygun4Net.WebApi.Tests", "Mindscape.Raygun4Net.WebApi.Tests\Mindscape.Raygun4Net.WebApi.Tests.csproj", "{80C7BB59-C753-4E64-9C8D-79B8D57C8215}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mindscape.Raygun4Net.Common", "Mindscape.Raygun4Net.Common\Mindscape.Raygun4Net.Common.csproj", "{07BC7731-D359-4D64-A55A-105FF387858C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -34,6 +36,12 @@ Global
 		{80C7BB59-C753-4E64-9C8D-79B8D57C8215}.Release|Any CPU.Build.0 = Release|Any CPU
 		{80C7BB59-C753-4E64-9C8D-79B8D57C8215}.Sign|Any CPU.ActiveCfg = Release|Any CPU
 		{80C7BB59-C753-4E64-9C8D-79B8D57C8215}.Sign|Any CPU.Build.0 = Release|Any CPU
+		{07BC7731-D359-4D64-A55A-105FF387858C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07BC7731-D359-4D64-A55A-105FF387858C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07BC7731-D359-4D64-A55A-105FF387858C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07BC7731-D359-4D64-A55A-105FF387858C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07BC7731-D359-4D64-A55A-105FF387858C}.Sign|Any CPU.ActiveCfg = Debug|Any CPU
+		{07BC7731-D359-4D64-A55A-105FF387858C}.Sign|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Mindscape.Raygun4Net.WebApi/Mindscape.Raygun4Net.WebApi.csproj b/Mindscape.Raygun4Net.WebApi/Mindscape.Raygun4Net.WebApi.csproj
index 47a560af9..770be02c8 100644
--- a/Mindscape.Raygun4Net.WebApi/Mindscape.Raygun4Net.WebApi.csproj
+++ b/Mindscape.Raygun4Net.WebApi/Mindscape.Raygun4Net.WebApi.csproj
@@ -32,6 +32,8 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Raygun4Net.WebApi.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/Mindscape.Raygun4Net.nuspec b/Mindscape.Raygun4Net.nuspec
index c0d8db1da..3337c1105 100644
--- a/Mindscape.Raygun4Net.nuspec
+++ b/Mindscape.Raygun4Net.nuspec
@@ -2,16 +2,14 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata minClientVersion="2.5">
     <id>Mindscape.Raygun4Net</id>
-    <version>6.0.1</version>
-    <title />
+    <version>6.0.2</version>
     <authors>Raygun</authors>
-    <owners />
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Raygun provider for .NET Framework</description>
-    <iconUrl>https://app.raygun.com/Content/Images/nuget-icon.png</iconUrl>
     <projectUrl>https://github.com/MindscapeHQ/raygun4net</projectUrl>
     <license type="file">LICENSE</license>
     <icon>128x128-transparent.png</icon>
+    <tags>Raygun debugging error monitoring error tracking bug tracking</tags>
   </metadata>
   <files>
     <!-- .NET 4.0 -->
diff --git a/Mindscape.Raygun4Net/Properties/AssemblyVersionInfo.cs b/Mindscape.Raygun4Net/Properties/AssemblyVersionInfo.cs
index a90c5fed7..896cc237c 100644
--- a/Mindscape.Raygun4Net/Properties/AssemblyVersionInfo.cs
+++ b/Mindscape.Raygun4Net/Properties/AssemblyVersionInfo.cs
@@ -10,5 +10,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.1.0")]
-[assembly: AssemblyFileVersion("6.0.1.0")]
+[assembly: AssemblyVersion("6.0.2.0")]
+[assembly: AssemblyFileVersion("6.0.2.0")]
diff --git a/Mindscape.Raygun4Net4.ClientProfile/Mindscape.Raygun4Net4.ClientProfile.csproj b/Mindscape.Raygun4Net4.ClientProfile/Mindscape.Raygun4Net4.ClientProfile.csproj
index 98fed17d6..b524991c2 100644
--- a/Mindscape.Raygun4Net4.ClientProfile/Mindscape.Raygun4Net4.ClientProfile.csproj
+++ b/Mindscape.Raygun4Net4.ClientProfile/Mindscape.Raygun4Net4.ClientProfile.csproj
@@ -29,6 +29,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>Raygun4Net4.ClientProfile.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <SignAssembly>true</SignAssembly>
diff --git a/Mindscape.Raygun4Net4.Nuget.Tests/Mindscape.Raygun4Net4.Nuget.Tests.csproj b/Mindscape.Raygun4Net4.Nuget.Tests/Mindscape.Raygun4Net4.Nuget.Tests.csproj
index b9ad0f2bc..8609dc462 100644
--- a/Mindscape.Raygun4Net4.Nuget.Tests/Mindscape.Raygun4Net4.Nuget.Tests.csproj
+++ b/Mindscape.Raygun4Net4.Nuget.Tests/Mindscape.Raygun4Net4.Nuget.Tests.csproj
@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="Mindscape.Raygun4Net" Version="6.0.0" />
+    <PackageReference Include="Mindscape.Raygun4Net" Version="6.0.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Include="NUnit.Analyzers" Version="3.6.1">
diff --git a/Mindscape.Raygun4Net4/Mindscape.Raygun4Net4.csproj b/Mindscape.Raygun4Net4/Mindscape.Raygun4Net4.csproj
index 214fb0f77..1c8de919b 100644
--- a/Mindscape.Raygun4Net4/Mindscape.Raygun4Net4.csproj
+++ b/Mindscape.Raygun4Net4/Mindscape.Raygun4Net4.csproj
@@ -28,6 +28,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AssemblyOriginatorKeyFile>Raygun4Net4.snk</AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Sign|AnyCPU' ">
     <AssemblyOriginatorKeyFile>Raygun4Net4.snk</AssemblyOriginatorKeyFile>
diff --git a/Mindscape.Raygun4Net4/Properties/AssemblyVersionInfo.cs b/Mindscape.Raygun4Net4/Properties/AssemblyVersionInfo.cs
index a90c5fed7..896cc237c 100644
--- a/Mindscape.Raygun4Net4/Properties/AssemblyVersionInfo.cs
+++ b/Mindscape.Raygun4Net4/Properties/AssemblyVersionInfo.cs
@@ -10,5 +10,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("6.0.1.0")]
-[assembly: AssemblyFileVersion("6.0.1.0")]
+[assembly: AssemblyVersion("6.0.2.0")]
+[assembly: AssemblyFileVersion("6.0.2.0")]
diff --git a/build.ps1 b/build.ps1
index 1a3d508e6..9bab9926c 100644
--- a/build.ps1
+++ b/build.ps1
@@ -8,8 +8,7 @@ properties {
     $solution_file_mvc =          "$root/Mindscape.Raygun4Net.Mvc.sln"
     $solution_file_webapi =       "$root/Mindscape.Raygun4Net.WebApi.sln"
     $solution_file_webjob =       "$root/Mindscape.Raygun4Net.Azure.WebJob.sln"
-    $configuration =              "Sign" ## We can sign the regular packages too
-    $configurationOld =           "Release" ## Update some time in the future
+    $configuration =              "Release"
     $build_dir =                  "$root\build\"
     $build_dir_net4 =             "$build_dir\net40"
     $build_dir_net4_client =      "$build_dir\net40-client"
@@ -22,7 +21,7 @@ properties {
     $env:Path +=                  ";$nunit_dir;$tools_dir;$nuget_dir"
 }
 
-task default -depends Compile 
+task default -depends Compile
 
 task Clean {
     remove-item -force -recurse $build_dir -ErrorAction SilentlyContinue | Out-Null
@@ -36,10 +35,9 @@ task Compile -depends Init {
     
     exec { msbuild "$solution_file_net4"   /p:OutDir=$build_dir_net4 /p:Configuration=$configuration }
     exec { msbuild "$solution_file_net4_client" /m /p:OutDir=$build_dir_net4_client /p:Configuration=$configuration }
-
-    exec { msbuild "$solution_file_mvc" /m /p:OutDir=$build_dir_mvc /p:Configuration=$configurationOld }
-    exec { msbuild "$solution_file_webapi" /m /p:OutDir=$build_dir_webapi /p:Configuration=$configurationOld }
-    exec { msbuild "$solution_file_webjob" /m /p:OutDir=$build_dir_webjob /p:Configuration=$configurationOld }
+    exec { msbuild "$solution_file_mvc" /m /p:OutDir=$build_dir_mvc /p:Configuration=$configuration }
+    exec { msbuild "$solution_file_webapi" /m /p:OutDir=$build_dir_webapi /p:Configuration=$configuration }
+    exec { msbuild "$solution_file_webjob" /m /p:OutDir=$build_dir_webjob /p:Configuration=$configuration }
 }