diff --git a/build/Targets/Imports.targets b/build/Targets/Imports.targets
index 02d0146b21454aa63220d033c78ea9fc23e4a8c7..80ed1706ee5197b85812948e9e9d0f2afe897f2b 100644
--- a/build/Targets/Imports.targets
+++ b/build/Targets/Imports.targets
@@ -541,7 +541,7 @@
     <PathMap Condition="'$(DeterministicSourceRoot)' != ''">$(RepoRoot)=$(DeterministicSourceRoot)</PathMap>
   </PropertyGroup>
 
-  <Target Name="_CheckForSpaces"
+  <Target Name="_CheckForSpacesInPathMap"
           BeforeTargets="CoreCompile">
     <Error Text="PathMap, DeterministicSourceRoot and RepoRoot shall not contain spaces (https://github.com/dotnet/roslyn/issues/22835)" 
            Condition="$(PathMap.Contains(' '))" />
diff --git a/build/Targets/RepoToolset/GitHash.props b/build/Targets/RepoToolset/GitHash.props
index aa4c9e3df3eef6acfb8d5a2c8e5b4b5bfe850dbc..2382ed52978612526584c2a7ef609473c5c6964a 100644
--- a/build/Targets/RepoToolset/GitHash.props
+++ b/build/Targets/RepoToolset/GitHash.props
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+
+<!--
+Copied from RepoToolset. Might be slightly modified to adjust for the current Roslyn build system specifics if necessary.
+
+Limit Roslyn specific changes to minumum.
+
+If a fix not specific to Roslyn is needed create a PR against https://github.com/dotnet/roslyn-tools repo updating the toolset.
+Update this file only if the change to RepoToolset gets approved and merged.
+-->
+
 <Project>
   <!--
 
diff --git a/build/Targets/RepoToolset/Readme.md b/build/Targets/RepoToolset/Readme.md
deleted file mode 100644
index 1132da138b9b2defd1be551d0867c06b7e8bc19e..0000000000000000000000000000000000000000
--- a/build/Targets/RepoToolset/Readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Files in this directory are copied from RepoToolset. They might be slightly modified to adjust for the current Roslyn build system specifics if necessary.
-
-Limit Roslyn specific changes to minumum.
-
-If a fix not specific to Roslyn is needed create a PR against https://github.com/dotnet/roslyn-tools repo updating the toolset. Update files in this directory only if the change to RepoToolset gets approved and merged.
- 
\ No newline at end of file
diff --git a/build/Targets/RepoToolset/SourceLink.targets b/build/Targets/RepoToolset/SourceLink.targets
index 7a393195fdd622ddf131ddb647b4a756816ea54a..fef3f86d6c050efc628451fc9d023753147ae043 100644
--- a/build/Targets/RepoToolset/SourceLink.targets
+++ b/build/Targets/RepoToolset/SourceLink.targets
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+
+<!--
+Copied from RepoToolset. Might be slightly modified to adjust for the current Roslyn build system specifics if necessary.
+
+Limit Roslyn specific changes to minumum.
+
+If a fix not specific to Roslyn is needed create a PR against https://github.com/dotnet/roslyn-tools repo updating the toolset.
+Update this file only if the change to RepoToolset gets approved and merged.
+-->
+
 <Project>
 
   <PropertyGroup>
diff --git a/build/Targets/RepoToolset/SymStore.targets b/build/Targets/RepoToolset/SymStore.targets
index 5df6d61c7b631ff6d1a36ae511b143a9a68ea5e7..fd5996b4806feafcb56259a77864839b4dcad31b 100644
--- a/build/Targets/RepoToolset/SymStore.targets
+++ b/build/Targets/RepoToolset/SymStore.targets
@@ -1,4 +1,14 @@
 <!-- Copyright (c)  Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
+
+<!--
+Copied from RepoToolset. Might be slightly modified to adjust for the current Roslyn build system specifics if necessary.
+
+Limit Roslyn specific changes to minumum.
+
+If a fix not specific to Roslyn is needed create a PR against https://github.com/dotnet/roslyn-tools repo updating the toolset.
+Update this file only if the change to RepoToolset gets approved and merged.
+-->
+
 <Project>
 
   <PropertyGroup>
@@ -68,7 +78,9 @@
 
   <!-- 
     The current MicroBuild symbol indexing task doesn't support specifying list of files to index.
-    Therefore we create hardlinks to the files in output directory, which will get signed.
+    Therefore we create hardlinks to the files in output directory, where DLLs and EXEs are signed.
+    These targets are executed after the signing phase so that we publish signed binaries to the
+    symbol store even if the files are copies and not hardlinked.
   -->
   <Target Name="_DeployWindowsSymbolsToSymStore"
           AfterTargets="_InnerDeployToSymStore"
diff --git a/build/Targets/Settings.props b/build/Targets/Settings.props
index eaa2b0fd2a1c428b2025d4c716177c8a2e5f20e2..5543559631074a126c088c289dcd15b956d56b65 100644
--- a/build/Targets/Settings.props
+++ b/build/Targets/Settings.props
@@ -21,6 +21,7 @@
     <DeveloperBuild>false</DeveloperBuild>
     <DeveloperBuild Condition="'$(OfficialBuild)' != 'true' AND '$(JenkinsBuild)' != 'true'">true</DeveloperBuild>
 
+    <ArtifactsSymStoreDirectory Condition="'$(DeveloperBuild)' != 'true' and '$(OS)' == 'Windows_NT'">$(BaseOutputPath)$(Configuration)\SymStore\</ArtifactsSymStoreDirectory>
     <NuGetToolPath>$(RepoRoot)nuget.exe</NuGetToolPath>
     <ToolsetPackagesDir>$(RepoRoot)build\ToolsetPackages\</ToolsetPackagesDir>
     <VSIXExpInstallerPackageName>RoslynTools.Microsoft.VSIXExpInstaller</VSIXExpInstallerPackageName>
@@ -33,6 +34,7 @@
     <RoslynPortableTargetFrameworks46>net46;netcoreapp2.0</RoslynPortableTargetFrameworks46>
     <RoslynPortableRuntimeIdentifiers>win7;win7-x64</RoslynPortableRuntimeIdentifiers>
  
+    <UsingToolPdbConverter>true</UsingToolPdbConverter>
     <Features>strict, IOperation</Features>
     <ProduceReferenceAssembly>true</ProduceReferenceAssembly>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
diff --git a/src/Test/Perf/Runner/Perf.Runner.csproj b/src/Test/Perf/Runner/Perf.Runner.csproj
index a9f39333855c830f1edfe2062930f62987150e70..fa2542fed662fd1f90416f40b059879692059674 100644
--- a/src/Test/Perf/Runner/Perf.Runner.csproj
+++ b/src/Test/Perf/Runner/Perf.Runner.csproj
@@ -12,7 +12,7 @@
     <RuntimeIdentifiers>win7;ubuntu.14.04;osx.10.10</RuntimeIdentifiers>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <SignAssembly>false</SignAssembly>
-    <Nonshipping>Perf.Runner.csproj</Nonshipping>
+    <Nonshipping>true</Nonshipping>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />