diff --git a/src/StreamExtended/Network/CopyStream.cs b/src/StreamExtended/Network/CopyStream.cs
index 197f8875a..041eecffe 100644
--- a/src/StreamExtended/Network/CopyStream.cs
+++ b/src/StreamExtended/Network/CopyStream.cs
@@ -36,6 +36,7 @@ public CopyStream(ICustomStreamReader reader, ICustomStreamWriter writer, IBuffe
             this.writer = writer;
             BufferSize = bufferSize;
             buffer = bufferPool.GetBuffer(bufferSize);
+            this.bufferPool = bufferPool;
         }
 
         public async Task<bool> FillBufferAsync(CancellationToken cancellationToken = default(CancellationToken))
diff --git a/src/StreamExtended/Network/CustomBufferedStream.cs b/src/StreamExtended/Network/CustomBufferedStream.cs
index 6ef058a03..9c815141c 100644
--- a/src/StreamExtended/Network/CustomBufferedStream.cs
+++ b/src/StreamExtended/Network/CustomBufferedStream.cs
@@ -649,6 +649,7 @@ public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, As
         {
             return baseStream.BeginWrite(buffer, offset, count, callback, state);
         }
+
         public override void EndWrite(IAsyncResult asyncResult)
         {
             baseStream.EndWrite(asyncResult);
diff --git a/src/StreamExtended/StreamExtended.csproj b/src/StreamExtended/StreamExtended.csproj
index fa7202ae6..6d76ef985 100644
--- a/src/StreamExtended/StreamExtended.csproj
+++ b/src/StreamExtended/StreamExtended.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>StrongKey.snk</AssemblyOriginatorKeyFile>
     <Version>1.0.0</Version>
@@ -18,8 +18,4 @@
     <None Remove="StreamExtended.nuspec" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="4.3.1" />
-  </ItemGroup>
-
 </Project>
\ No newline at end of file
diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
index d665fe4d9..d24fa80be 100644
--- a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
+++ b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.Mono.csproj
@@ -12,9 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BrotliSharpLib" Version="0.3.1" />
-    <PackageReference Include="Portable.BouncyCastle" Version="1.8.3" />
-    <PackageReference Include="StreamExtended" Version="1.0.188-beta" />
+    <PackageReference Include="BrotliSharpLib" Version="0.3.3" />
+    <PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
index f28255ad5..f7387218e 100644
--- a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
+++ b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.NetCore.csproj
@@ -14,7 +14,6 @@
   <ItemGroup>
     <PackageReference Include="BrotliSharpLib" Version="0.3.3" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.8.5" />
-    <PackageReference Include="StreamExtended" Version="1.0.209-beta" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
index b3606d7bd..6da302743 100644
--- a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
+++ b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.csproj
@@ -19,19 +19,19 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Win32.Registry">
-      <Version>4.4.0</Version>
+      <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="System.Security.Principal.Windows">
-      <Version>4.4.1</Version>
+      <Version>4.5.1</Version>
     </PackageReference>
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
     <PackageReference Include="Microsoft.Win32.Registry">
-      <Version>4.4.0</Version>
+      <Version>4.5.0</Version>
     </PackageReference>
     <PackageReference Include="System.Security.Principal.Windows">
-      <Version>4.4.1</Version>
+      <Version>4.5.1</Version>
     </PackageReference>
   </ItemGroup>
 
diff --git a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
index 643aa2b5c..d548d78f0 100644
--- a/src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
+++ b/src/Titanium.Web.Proxy/Titanium.Web.Proxy.nuspec
@@ -21,14 +21,14 @@
 	  <group targetFramework="netstandard2.0">
 		  <dependency id="Portable.BouncyCastle" version="1.8.5" />
 		  <dependency id="BrotliSharpLib" version="0.3.3" />
-		  <dependency id="Microsoft.Win32.Registry" version="4.4.0" />
-		  <dependency id="System.Security.Principal.Windows" version="4.4.1" />
+		  <dependency id="Microsoft.Win32.Registry" version="4.5.0" />
+		  <dependency id="System.Security.Principal.Windows" version="4.5.1" />
 	  </group>
 	  <group targetFramework="netcoreapp2.1">
 		  <dependency id="Portable.BouncyCastle" version="1.8.5" />
 		  <dependency id="BrotliSharpLib" version="0.3.3" />
-		  <dependency id="Microsoft.Win32.Registry" version="4.4.0" />
-		  <dependency id="System.Security.Principal.Windows" version="4.4.1" />
+		  <dependency id="Microsoft.Win32.Registry" version="4.5.0" />
+		  <dependency id="System.Security.Principal.Windows" version="4.5.1" />
 	  </group>
     </dependencies>
   </metadata>
diff --git a/tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj b/tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
index 5da157f06..95e3124c0 100644
--- a/tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
+++ b/tests/Titanium.Web.Proxy.IntegrationTests/Titanium.Web.Proxy.IntegrationTests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.2</TargetFramework>
@@ -17,7 +17,7 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="2.2.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>
diff --git a/tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj b/tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj
index dff5cb58c..9e4519ec4 100644
--- a/tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj
+++ b/tests/Titanium.Web.Proxy.UnitTests/Titanium.Web.Proxy.UnitTests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
     <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
   </ItemGroup>