diff --git a/Directory.Build.targets b/Directory.Build.targets
index 9989b1046b..8296c12835 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project InitialTargets="EnsureKoreBuildRestored">
-  <Target Name="EnsureKoreBuildRestored" Condition=" '$(KoreBuildRestoreTargetsImported)' != 'true' ">
+  <Target Name="EnsureKoreBuildRestored" Condition=" '$(KoreBuildRestoreTargetsImported)' != 'true' AND '$(MSBuildProjectName)' != 'BenchmarkDotNet.Autogenerated'">
     <PropertyGroup>
       <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh</_BootstrapperFile>
       <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd</_BootstrapperFile>
diff --git a/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj b/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj
index 3a982816ef..bee6d2f9a3 100644
--- a/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj
+++ b/benchmarks/Kestrel.Performance/Kestrel.Performance.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AssemblyName>Microsoft.AspNetCore.Server.Kestrel.Performance</AssemblyName>
+    <!-- Using shorter assembly name instead of Microsoft.AspNetCore.Server.Kestrel.Performance because https://github.com/dotnet/BenchmarkDotNet/issues/498 -->
+    <AssemblyName>Kestrel.Performance</AssemblyName>
     <RootNamespace>Microsoft.AspNetCore.Server.Kestrel.Performance</RootNamespace>
     <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netcoreapp2.0</TargetFrameworks>
diff --git a/benchmarks/Kestrel.Performance/README.md b/benchmarks/Kestrel.Performance/README.md
index 63db0c3d7e..91991f82ff 100644
--- a/benchmarks/Kestrel.Performance/README.md
+++ b/benchmarks/Kestrel.Performance/README.md
@@ -2,10 +2,10 @@
 
 To run a specific benchmark add it as parameter
 ```
-dotnet run -c Release RequestParsing
+dotnet run -f netcoreapp2.0 -c Release RequestParsing
 ```
 To run all use `All` as parameter
 ```
-dotnet run -c Release All
+dotnet run -f netcoreapp2.0 -c Release All
 ```
 Using no parameter will list all available benchmarks