diff --git a/AsyncRx.NET/ApiCompare/ApiCompare.csproj b/AsyncRx.NET/ApiCompare/ApiCompare.csproj
index 4496ab283..8f7fdf81b 100644
--- a/AsyncRx.NET/ApiCompare/ApiCompare.csproj
+++ b/AsyncRx.NET/ApiCompare/ApiCompare.csproj
@@ -9,10 +9,6 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="6.0.0-preview.1" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\System.Reactive.Async\System.Reactive.Async.csproj" />
   </ItemGroup>
diff --git a/AsyncRx.NET/System.Reactive.Async/Linq/Operators/CombineLatest.Generated.tt b/AsyncRx.NET/System.Reactive.Async/Linq/Operators/CombineLatest.Generated.tt
index 8e0d08daf..5e42119a4 100644
--- a/AsyncRx.NET/System.Reactive.Async/Linq/Operators/CombineLatest.Generated.tt
+++ b/AsyncRx.NET/System.Reactive.Async/Linq/Operators/CombineLatest.Generated.tt
@@ -161,7 +161,7 @@ for (var j = 1; j <= i; j++)
 }
 #>
 
-            var gate = new AsyncLock();
+            var gate = new AsyncGate();
 
             return
             (
@@ -248,7 +248,7 @@ for (var j = 1; j <= i; j++)
 }
 #>
 
-            var gate = new AsyncLock();
+            var gate = new AsyncGate();
 
             return
             (
diff --git a/AsyncRx.NET/System.Reactive.Async/Linq/Operators/Zip.Generated.tt b/AsyncRx.NET/System.Reactive.Async/Linq/Operators/Zip.Generated.tt
index 597f76df4..f21866efc 100644
--- a/AsyncRx.NET/System.Reactive.Async/Linq/Operators/Zip.Generated.tt
+++ b/AsyncRx.NET/System.Reactive.Async/Linq/Operators/Zip.Generated.tt
@@ -152,7 +152,7 @@ for (var i = 2; i <= 15; i++)
             if (observer == null)
                 throw new ArgumentNullException(nameof(observer));
 
-            var gate = new AsyncLock();
+            var gate = new AsyncGate();
 
 <#
 for (var j = 1; j <= i; j++)
@@ -258,7 +258,7 @@ for (var j = 1; j <= i; j++)
             if (selector == null)
                 throw new ArgumentNullException(nameof(selector));
 
-            var gate = new AsyncLock();
+            var gate = new AsyncGate();
 
 <#
 for (var j = 1; j <= i; j++)
diff --git a/AsyncRx.NET/System.Reactive.Async/System.Reactive.Async.csproj b/AsyncRx.NET/System.Reactive.Async/System.Reactive.Async.csproj
index e2a108c32..191afa318 100644
--- a/AsyncRx.NET/System.Reactive.Async/System.Reactive.Async.csproj
+++ b/AsyncRx.NET/System.Reactive.Async/System.Reactive.Async.csproj
@@ -1,13 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
 
     <RootNamespace>System.Reactive</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="6.0.0-preview.1" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'netstandard2.0'" />
+    <PackageReference Include="System.Reactive" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>