diff --git a/lightning/src/chain/channelmonitor.rs b/lightning/src/chain/channelmonitor.rs
index a9250c0a787..cffb968bd9a 100644
--- a/lightning/src/chain/channelmonitor.rs
+++ b/lightning/src/chain/channelmonitor.rs
@@ -3172,7 +3172,7 @@ impl<Signer: WriteableEcdsaChannelSigner> ChannelMonitorImpl<Signer> {
 							(htlc, htlc_source.as_ref().map(|htlc_source| htlc_source.as_ref()))
 						), logger);
 				} else {
-					// Our fuzzers aren't contrained by pesky things like valid signatures, so can
+					// Our fuzzers aren't constrained by pesky things like valid signatures, so can
 					// spend our funding output with a transaction which doesn't match our past
 					// commitment transactions. Thus, we can only debug-assert here when not
 					// fuzzing.
diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index d1c7a5ee5f8..31989a011a9 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -247,9 +247,14 @@ pub struct InboundHTLCDetails {
 	/// The payment hash.
 	pub payment_hash: PaymentHash,
 	/// The state of the HTLC in the state machine.
+	///
 	/// Determines on which commitment transactions the HTLC is included and what message the HTLC is
 	/// waiting for to advance to the next state.
+	///
 	/// See [`InboundHTLCStateDetails`] for information on the specific states.
+	///
+	/// LDK will always fill this field in, but when downgrading to prior versions of LDK, new
+	/// states may result in `None` here.
 	pub state: Option<InboundHTLCStateDetails>,
 	/// Whether the HTLC has an output below the local dust limit. If so, the output will be trimmed
 	/// from the local commitment transaction and added to the commitment transaction fee.
@@ -428,9 +433,14 @@ pub struct OutboundHTLCDetails {
 	/// The payment hash.
 	pub payment_hash: PaymentHash,
 	/// The state of the HTLC in the state machine.
+	///
 	/// Determines on which commitment transactions the HTLC is included and what message the HTLC is
 	/// waiting for to advance to the next state.
+	///
 	/// See [`OutboundHTLCStateDetails`] for information on the specific states.
+	///
+	/// LDK will always fill this field in, but when downgrading to prior versions of LDK, new
+	/// states may result in `None` here.
 	pub state: Option<OutboundHTLCStateDetails>,
 	/// The extra fee being skimmed off the top of this HTLC.
 	pub skimmed_fee_msat: Option<u64>,