diff --git a/lightning-invoice/src/lib.rs b/lightning-invoice/src/lib.rs
index d30fb638d34..d87c6c89372 100644
--- a/lightning-invoice/src/lib.rs
+++ b/lightning-invoice/src/lib.rs
@@ -407,7 +407,10 @@ impl From<Network> for Currency {
 			Network::Testnet => Currency::BitcoinTestnet,
 			Network::Regtest => Currency::Regtest,
 			Network::Signet => Currency::Signet,
-			_ => unreachable!(),
+			_ => {
+				debug_assert!(false, "Need to handle new rust-bitcoin network type");
+				Currency::Regtest
+			},
 		}
 	}
 }
diff --git a/lightning/src/offers/invoice.rs b/lightning/src/offers/invoice.rs
index d0e866b2f2b..02d68b63536 100644
--- a/lightning/src/offers/invoice.rs
+++ b/lightning/src/offers/invoice.rs
@@ -926,20 +926,11 @@ impl InvoiceContents {
 			};
 
 			let program = &address.program;
-			if program.len() < 2 || program.len() > 40 {
-				return None;
-			}
-
 			let witness_program = match WitnessProgram::new(version, program.clone()) {
 				Ok(witness_program) => witness_program,
 				Err(_) => return None,
 			};
-			let address = Address::new(network, Payload::WitnessProgram(witness_program));
-			if !address.is_spend_standard() && version == WitnessVersion::V0 {
-				return None;
-			}
-
-			Some(address)
+			Some(Address::new(network, Payload::WitnessProgram(witness_program)))
 		};
 
 		self.fields().fallbacks