diff --git a/.github/workflows/semver.yml b/.github/workflows/semver.yml
index cdbd90acdb..57f4b9b2ed 100644
--- a/.github/workflows/semver.yml
+++ b/.github/workflows/semver.yml
@@ -1,5 +1,7 @@
 name: SemVer checks
-on: [push, pull_request]
+# Alby: disabled as this fork intentionally extends the upstream API, so semver checks
+# against the upstream crates.io release always fail. Can still be run manually.
+on: workflow_dispatch
 
 jobs:
   semver-checks:
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index c1e385e2d3..c12a083787 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -1,6 +1,7 @@
 name: CI Checks - Swift Tests
 
-on: [push, pull_request]
+# Alby: disabled as we only compile for Alby Hub, not mobile. Can still be run manually.
+on: workflow_dispatch
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
diff --git a/Cargo.lock b/Cargo.lock
index 4f4dad1f2c..50dd4e166e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1910,7 +1910,7 @@ dependencies = [
 
 [[package]]
 name = "ldk-node"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
  "base64 0.22.1",
  "bdk_chain",
diff --git a/src/io/vss_store.rs b/src/io/vss_store.rs
index 84c0277870..ec09f62ad8 100644
--- a/src/io/vss_store.rs
+++ b/src/io/vss_store.rs
@@ -930,7 +930,7 @@ mod tests {
 	use vss_client::headers::FixedHeaders;
 
 	use super::*;
-	use crate::io::test_utils::do_read_write_remove_list_persist;
+	use crate::io::test_utils::{do_read_write_remove_list_persist, InMemoryStore};
 
 	#[test]
 	fn vss_read_write_remove_list_persist() {
@@ -940,8 +940,15 @@ mod tests {
 		let mut vss_seed = [0u8; 32];
 		rng.fill_bytes(&mut vss_seed);
 		let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
-		let vss_store =
-			VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
+		let secondary_kv_store: Arc<crate::types::DynStore> = Arc::new(InMemoryStore::new());
+		let vss_store = VssStore::new(
+			vss_base_url,
+			rand_store_id,
+			vss_seed,
+			header_provider,
+			secondary_kv_store,
+		)
+		.unwrap();
 		do_read_write_remove_list_persist(&vss_store);
 	}
 
@@ -953,8 +960,15 @@ mod tests {
 		let mut vss_seed = [0u8; 32];
 		rng.fill_bytes(&mut vss_seed);
 		let header_provider = Arc::new(FixedHeaders::new(HashMap::new()));
-		let vss_store =
-			VssStore::new(vss_base_url, rand_store_id, vss_seed, header_provider).unwrap();
+		let secondary_kv_store: Arc<crate::types::DynStore> = Arc::new(InMemoryStore::new());
+		let vss_store = VssStore::new(
+			vss_base_url,
+			rand_store_id,
+			vss_seed,
+			header_provider,
+			secondary_kv_store,
+		)
+		.unwrap();
 
 		do_read_write_remove_list_persist(&vss_store);
 		drop(vss_store)
diff --git a/src/lib.rs b/src/lib.rs
index 826dab44b5..365162ef6e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -133,7 +133,6 @@ use gossip::GossipSource;
 use graph::NetworkGraph;
 pub use io::utils::generate_entropy_mnemonic;
 // Alby: export LSPS2 opening fee computation for local fee estimation in Hub.
-pub use liquidity::lsps2_compute_opening_fee_msat;
 use io::utils::write_node_metrics;
 use lightning::chain::BestBlock;
 use lightning::events::bump_transaction::{Input, Wallet as LdkWallet};
@@ -146,6 +145,7 @@ use lightning::ln::msgs::SocketAddress;
 use lightning::routing::gossip::NodeAlias;
 use lightning::util::persist::KVStoreSync;
 use lightning_background_processor::process_events_async;
+pub use liquidity::lsps2_compute_opening_fee_msat;
 use liquidity::{LSPS1Liquidity, LSPS2Liquidity, LiquiditySource};
 use logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
 use payment::asynchronous::om_mailbox::OnionMessageMailbox;
diff --git a/src/liquidity.rs b/src/liquidity.rs
index b6479b5d38..69484d3e30 100644
--- a/src/liquidity.rs
+++ b/src/liquidity.rs
@@ -1573,10 +1573,8 @@ pub struct LSPS2Liquidity {
 
 impl LSPS2Liquidity {
 	pub(crate) fn new(
-		runtime: Arc<Runtime>,
-		connection_manager: Arc<ConnectionManager<Arc<Logger>>>,
-		liquidity_source: Option<Arc<LiquiditySource<Arc<Logger>>>>,
-		logger: Arc<Logger>,
+		runtime: Arc<Runtime>, connection_manager: Arc<ConnectionManager<Arc<Logger>>>,
+		liquidity_source: Option<Arc<LiquiditySource<Arc<Logger>>>>, logger: Arc<Logger>,
 	) -> Self {
 		Self { runtime, connection_manager, liquidity_source, logger }
 	}
@@ -1606,9 +1604,8 @@ impl LSPS2Liquidity {
 		log_info!(self.logger, "Connected to LSPS2 LSP {}@{}. ", lsp_node_id, lsp_address);
 
 		let liquidity_source = Arc::clone(&liquidity_source);
-		self.runtime.block_on(async move {
-			liquidity_source.lsps2_request_opening_fee_params().await
-		})
+		self.runtime
+			.block_on(async move { liquidity_source.lsps2_request_opening_fee_params().await })
 	}
 }
 
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index 432354945b..f342ad8464 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -1136,9 +1136,10 @@ pub(crate) async fn do_channel_full_cycle<E: ElectrumApi>(
 		node_a.list_payments_with_filter(|p| matches!(p.kind, PaymentKind::Bolt11 { .. })).len(),
 		5
 	);
+	// Alby: +2 for the min_cltv_expiry_delta invoices created above
 	assert_eq!(
 		node_b.list_payments_with_filter(|p| matches!(p.kind, PaymentKind::Bolt11 { .. })).len(),
-		6
+		8
 	);
 	assert_eq!(
 		node_a