diff --git a/src/Smidge.Nuglify/SourceMapDeclaration.cs b/src/Smidge.Nuglify/SourceMapDeclaration.cs
index 065ae00..6a745e0 100644
--- a/src/Smidge.Nuglify/SourceMapDeclaration.cs
+++ b/src/Smidge.Nuglify/SourceMapDeclaration.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using Microsoft.Extensions.Options;
 using Smidge.Cache;
@@ -66,11 +66,11 @@ private string GetSourceMapUrl(string bundleName, string fileExtension, bool deb
                 string.Format(
                     handler,
                     _smidgeOptions.Value.UrlOptions.BundleFilePath + "/nmap",
-                    Uri.EscapeUriString(bundleName),
+                    Uri.EscapeDataString(bundleName),
                     fileExtension,
                     debug ? 'd' : 'v',
                     cacheBusterValue));
 
         }
     }
-}
\ No newline at end of file
+}
diff --git a/test/Smidge.Benchmarks/JsMinifyBenchmarks.cs b/test/Smidge.Benchmarks/JsMinifyBenchmarks.cs
index c67b343..2d9734c 100644
--- a/test/Smidge.Benchmarks/JsMinifyBenchmarks.cs
+++ b/test/Smidge.Benchmarks/JsMinifyBenchmarks.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -53,8 +53,8 @@ private class Config : ManualConfig
         {
             public Config()
             {
-                Add(MemoryDiagnoser.Default);
-                Add(new MinifiedPercentColumn());
+                AddDiagnoser(MemoryDiagnoser.Default);
+                AddColumn(new MinifiedPercentColumn());
 
                 ////The 'quick and dirty' settings, so it runs a little quicker
                 //// see benchmarkdotnet FAQ
@@ -168,4 +168,4 @@ public async Task Nuglify()
         }
 
     }
-}
\ No newline at end of file
+}