diff --git a/deployment/cake/lib-msbuild.cake b/deployment/cake/lib-msbuild.cake
index 682c488..1dacdfd 100644
--- a/deployment/cake/lib-msbuild.cake
+++ b/deployment/cake/lib-msbuild.cake
@@ -1,5 +1,5 @@
-#addin "nuget:?package=Cake.Issues&version=2.0.0"
-#addin "nuget:?package=Cake.Issues.MsBuild&version=2.0.0"
+#addin "nuget:?package=Cake.Issues&version=3.0.0"
+#addin "nuget:?package=Cake.Issues.MsBuild&version=3.0.0"
 
 #tool "nuget:?package=MSBuild.Extension.Pack&version=1.9.1"
 
diff --git a/src/Directory.Build.shared.implicit.props b/src/Directory.Build.shared.implicit.props
index b223f6f..059b636 100644
--- a/src/Directory.Build.shared.implicit.props
+++ b/src/Directory.Build.shared.implicit.props
@@ -18,6 +18,11 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
 
+  <!-- Use relative paths in stack traces -->
+  <PropertyGroup>
+    <PathMap>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))=./</PathMap>
+  </PropertyGroup>
+
   <!-- Workaround for binding redirects in non exe assemblies, see https://github.com/Microsoft/msbuild/issues/1310#issuecomment-309596435 -->
   <Target Name="ForceGenerationOfBindingRedirects"
           AfterTargets="ResolveAssemblyReferences"