diff --git a/src/payment/store.rs b/src/payment/store.rs
index d5ed722e2c..d6dee70ffe 100644
--- a/src/payment/store.rs
+++ b/src/payment/store.rs
@@ -16,7 +16,7 @@ use lightning::offers::offer::OfferId;
 use lightning::util::ser::{Readable, Writeable};
 use lightning::{
 	_init_and_read_len_prefixed_tlv_fields, impl_writeable_tlv_based,
-	impl_writeable_tlv_based_enum, write_tlv_fields,
+	impl_writeable_tlv_based_enum, impl_writeable_tlv_based_enum_upgradable, write_tlv_fields,
 };
 use lightning_types::payment::{PaymentHash, PaymentPreimage, PaymentSecret};
 use lightning_types::string::UntrustedString;
@@ -490,7 +490,7 @@ pub enum TransactionType {
 	},
 }
 
-impl_writeable_tlv_based_enum!(TransactionType,
+impl_writeable_tlv_based_enum_upgradable!(TransactionType,
 	(0, Funding) => {
 		(0, channels, optional_vec),
 	},
@@ -639,7 +639,7 @@ impl PaymentKind {
 impl_writeable_tlv_based_enum!(PaymentKind,
 	(0, Onchain) => {
 		(0, txid, required),
-		(1, tx_type, option),
+		(1, tx_type, upgradable_option),
 		(2, status, required),
 	},
 	(2, Bolt11) => {
diff --git a/src/wallet/provenance.rs b/src/wallet/provenance.rs
index 94523de9d1..2029d12f5d 100644
--- a/src/wallet/provenance.rs
+++ b/src/wallet/provenance.rs
@@ -145,7 +145,7 @@ pub(crate) struct ChannelTxFacts {
 impl_writeable_tlv_based!(ChannelTxFacts, {
 	(0, txid, required),
 	(2, outputs, optional_vec),
-	(4, self_role, option),
+	(4, self_role, upgradable_option),
 	(6, local_figures, option),
 	(8, recorded_at_height, required),
 });