diff --git a/lightning/src/events/mod.rs b/lightning/src/events/mod.rs
index a81394a6bfb..15a9770e963 100644
--- a/lightning/src/events/mod.rs
+++ b/lightning/src/events/mod.rs
@@ -594,14 +594,9 @@ pub enum Event {
 	FundingTxBroadcastSafe {
 		/// The `channel_id` indicating which channel has reached this stage.
 		channel_id: ChannelId,
-		/// The `user_channel_id` value passed in to [`ChannelManager::create_channel`] for outbound
-		/// channels, or to [`ChannelManager::accept_inbound_channel`] for inbound channels if
-		/// [`UserConfig::manually_accept_inbound_channels`] config flag is set to `true`. Otherwise
-		/// `user_channel_id` will be randomized for an inbound channel.
+		/// The `user_channel_id` value passed in to [`ChannelManager::create_channel`].
 		///
 		/// [`ChannelManager::create_channel`]: crate::ln::channelmanager::ChannelManager::create_channel
-		/// [`ChannelManager::accept_inbound_channel`]: crate::ln::channelmanager::ChannelManager::accept_inbound_channel
-		/// [`UserConfig::manually_accept_inbound_channels`]: crate::util::config::UserConfig::manually_accept_inbound_channels
 		user_channel_id: u128,
 		/// The outpoint of the channel's funding transaction.
 		funding_txo: OutPoint,
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index 76f006a009c..0e54c556742 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -4436,7 +4436,8 @@ where
 
 
 	/// **Unsafe**: This method does not check the validity of the provided output. It is the
-	/// caller's responsibility to ensure that.
+	/// caller's responsibility to ensure that. Its important to validate you are using SegWit
+	/// output, as well as a final absolute timelock.
 	///
 	/// For a safer method, please refer to [`ChannelManager::funding_transaction_generated`].
 	///
@@ -4452,9 +4453,8 @@ where
 	/// Returns [`APIError::ChannelUnavailable`] if a funding transaction has already been provided
 	/// for the channel or if the channel has been closed as indicated by [`Event::ChannelClosed`].
 	///
-	/// May panic if the output found in the funding transaction is duplicative with some other
-	/// channel (note that this should be trivially prevented by using unique funding transaction
-	/// keys per-channel).
+	/// May panic if the funding output is duplicative with some other channel (note that this
+	/// should be trivially prevented by using unique funding transaction keys per-channel).
 	///
 	/// Note to keep the miner incentives aligned in moving the blockchain forward, we recommend
 	/// the wallet software generating the funding transaction to apply anti-fee sniping as
@@ -6721,7 +6721,7 @@ where
 						emit_funding_tx_broadcast_safe_event!(pending_events, channel, funding_txo.into_bitcoin_outpoint())
 					},
 					None => {
-						log_error!(logger, "Channel resumed without a funding txo, this should never happen!");
+						debug_assert!(false, "Channel resumed without a funding txo, this should never happen!");
 						return (htlc_forwards, decode_update_add_htlcs);
 					}
 				};