diff --git a/src/Microsoft.SymbolStore/SymbolStores/HttpSymbolStore.cs b/src/Microsoft.SymbolStore/SymbolStores/HttpSymbolStore.cs
index 5887261547..32b9856802 100644
--- a/src/Microsoft.SymbolStore/SymbolStores/HttpSymbolStore.cs
+++ b/src/Microsoft.SymbolStore/SymbolStores/HttpSymbolStore.cs
@@ -67,7 +67,15 @@ public HttpSymbolStore(ITracer tracer, SymbolStore backingStore, Uri symbolServe
             _authenticationFunc = authenticationFunc;
 
             // Create client
-            _client = new HttpClient
+#if NETSTANDARD2_0
+            _client = new HttpClient(new HttpClientHandler()
+            {
+                UseProxy = true,
+                DefaultProxyCredentials = CredentialCache.DefaultNetworkCredentials,
+            })
+#else
+            _client = new HttpClient()
+#endif
             {
                 Timeout = TimeSpan.FromMinutes(4)
             };
diff --git a/src/Tools/dotnet-dump/Analyzer.cs b/src/Tools/dotnet-dump/Analyzer.cs
index 730d5fa5e2..1e887b527a 100644
--- a/src/Tools/dotnet-dump/Analyzer.cs
+++ b/src/Tools/dotnet-dump/Analyzer.cs
@@ -7,7 +7,6 @@
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Diagnostics.DebugServices;
 using Microsoft.Diagnostics.DebugServices.Implementation;
 using Microsoft.Diagnostics.ExtensionCommands;
diff --git a/src/Tools/dotnet-symbol/Program.cs b/src/Tools/dotnet-symbol/Program.cs
index 8aa07ddeb7..60a5bd5051 100644
--- a/src/Tools/dotnet-symbol/Program.cs
+++ b/src/Tools/dotnet-symbol/Program.cs
@@ -68,7 +68,7 @@ public static void Main(string[] args)
                         program.SymbolServers.Add(new ServerInfo { Uri = uri, PersonalAccessToken = null });
                         break;
 
-                     case "--internal-server":
+                    case "--internal-server":
                         Uri.TryCreate("https://symweb.azurefd.net/", UriKind.Absolute, out uri);
                         program.SymbolServers.Add(new ServerInfo { Uri = uri, PersonalAccessToken = null, InternalSymwebServer = true });
                         break;
@@ -597,8 +597,7 @@ internal void VerifyCoreDump()
 
         private IEnumerable<string> GetInputFiles()
         {
-            IEnumerable<string> inputFiles = InputFilePaths.SelectMany((string file) =>
-            {
+            IEnumerable<string> inputFiles = InputFilePaths.SelectMany((string file) => {
                 string directory = Path.GetDirectoryName(file);
                 string pattern = Path.GetFileName(file);
                 return Directory.EnumerateFiles(string.IsNullOrWhiteSpace(directory) ? "." : directory, pattern,