diff --git a/BTCPayServer.Common/BTCPayServer.Common.csproj b/BTCPayServer.Common/BTCPayServer.Common.csproj
index 74ab3799a..fc5b9c796 100644
--- a/BTCPayServer.Common/BTCPayServer.Common.csproj
+++ b/BTCPayServer.Common/BTCPayServer.Common.csproj
@@ -5,6 +5,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.9" Condition="'$(TargetFramework)' == 'netcoreapp2.1'" />
     <FrameworkReference Include="Microsoft.AspNetCore.App" Condition="'$(TargetFramework)' != 'netcoreapp2.1'" />
-    <PackageReference Include="NBXplorer.Client" Version="2.0.0.23" />
+    <PackageReference Include="NBXplorer.Client" Version="2.0.0.24" />
   </ItemGroup>
 </Project>
diff --git a/BTCPayServer.Tests/docker-compose.yml b/BTCPayServer.Tests/docker-compose.yml
index a75b85e50..2b2984de6 100644
--- a/BTCPayServer.Tests/docker-compose.yml
+++ b/BTCPayServer.Tests/docker-compose.yml
@@ -76,7 +76,7 @@ services:
       - customer_lnd
       - merchant_lnd
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.62
+    image: nicolasdorier/nbxplorer:2.0.0.63
     restart: unless-stopped
     ports:
       - "32838:32838"
diff --git a/BTCPayServer/Controllers/StoresController.BTCLike.cs b/BTCPayServer/Controllers/StoresController.BTCLike.cs
index 0a306f530..456eb3d6f 100644
--- a/BTCPayServer/Controllers/StoresController.BTCLike.cs
+++ b/BTCPayServer/Controllers/StoresController.BTCLike.cs
@@ -88,8 +88,7 @@ namespace BTCPayServer.Controllers
                         var segwit = network.NBitcoinNetwork.Consensus.SupportSegwit;
                         var derivation = new DerivationStrategyFactory(network.NBitcoinNetwork).CreateDirectDerivationStrategy(getxpubResult.ExtPubKey, new DerivationStrategyOptions()
                         {
-                            P2SH = segwit,
-                            Legacy = !segwit
+                            ScriptPubKeyType = segwit ? ScriptPubKeyType.SegwitP2SH : ScriptPubKeyType.Legacy
                         });
                         getxpubResult.DerivationScheme = derivation;
                         getxpubResult.RootFingerprint = (await hw.GetExtPubKey(network, new KeyPath(), normalOperationTimeout.Token)).ExtPubKey.PubKey.GetHDFingerPrint();
diff --git a/BTCPayServer/Data/PaymentRequestDataExtensions.cs b/BTCPayServer/Data/PaymentRequestDataExtensions.cs
index a5933fea5..87d560ada 100644
--- a/BTCPayServer/Data/PaymentRequestDataExtensions.cs
+++ b/BTCPayServer/Data/PaymentRequestDataExtensions.cs
@@ -21,8 +21,8 @@ namespace BTCPayServer.Data
 
         public static bool SetBlob(this PaymentRequestData paymentRequestData, PaymentRequestBlob blob)
         {
-            var original = new Serializer(Network.Main).ToString(paymentRequestData.GetBlob());
-            var newBlob = new Serializer(Network.Main).ToString(blob);
+            var original = new Serializer(null).ToString(paymentRequestData.GetBlob());
+            var newBlob = new Serializer(null).ToString(blob);
             if (original == newBlob)
                 return false;
             paymentRequestData.Blob = ZipUtils.Zip(newBlob);
diff --git a/BTCPayServer/Data/StoreDataExtensions.cs b/BTCPayServer/Data/StoreDataExtensions.cs
index dfa425f92..40c674691 100644
--- a/BTCPayServer/Data/StoreDataExtensions.cs
+++ b/BTCPayServer/Data/StoreDataExtensions.cs
@@ -45,11 +45,10 @@ namespace BTCPayServer.Data
         }
 #pragma warning restore CS0618
 
-        static Network Dummy = Network.Main;
-
+        
         public static StoreBlob GetStoreBlob(this StoreData storeData)
         {
-            var result = storeData.StoreBlob == null ? new StoreBlob() : new Serializer(Dummy).ToObject<StoreBlob>(Encoding.UTF8.GetString(storeData.StoreBlob));
+            var result = storeData.StoreBlob == null ? new StoreBlob() : new Serializer(null).ToObject<StoreBlob>(Encoding.UTF8.GetString(storeData.StoreBlob));
             if (result.PreferredExchange == null)
                 result.PreferredExchange = CoinAverageRateProvider.CoinAverageName;
             return result;
@@ -57,8 +56,8 @@ namespace BTCPayServer.Data
 
         public static bool SetStoreBlob(this StoreData storeData, StoreBlob storeBlob)
         {
-            var original = new Serializer(Dummy).ToString(storeData.GetStoreBlob());
-            var newBlob = new Serializer(Dummy).ToString(storeBlob);
+            var original = new Serializer(null).ToString(storeData.GetStoreBlob());
+            var newBlob = new Serializer(null).ToString(storeBlob);
             if (original == newBlob)
                 return false;
             storeData.StoreBlob = Encoding.UTF8.GetBytes(newBlob);
diff --git a/BTCPayServer/Services/Invoices/InvoiceEntity.cs b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
index d18f8c109..a25ccfe40 100644
--- a/BTCPayServer/Services/Invoices/InvoiceEntity.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
@@ -543,7 +543,7 @@ namespace BTCPayServer.Services.Invoices
         public PaymentMethodDictionary GetPaymentMethods()
         {
             PaymentMethodDictionary paymentMethods = new PaymentMethodDictionary();
-            var serializer = new Serializer(Dummy);
+            var serializer = new Serializer(null);
 #pragma warning disable CS0618
             if (PaymentMethod != null)
             {
@@ -574,7 +574,7 @@ namespace BTCPayServer.Services.Invoices
         public void SetPaymentMethods(PaymentMethodDictionary paymentMethods)
         {
             var obj = new JObject();
-            var serializer = new Serializer(Dummy);
+            var serializer = new Serializer(null);
 #pragma warning disable CS0618
             foreach (var v in paymentMethods)
             {