diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs
index 9361cd3c749..478b7de812c 100644
--- a/lightning/src/ln/channel.rs
+++ b/lightning/src/ln/channel.rs
@@ -12525,9 +12525,9 @@ where
 		self.context.pending_outbound_htlcs.push(OutboundHTLCOutput {
 			htlc_id: self.context.next_holder_htlc_id,
 			amount_msat,
-			payment_hash: payment_hash.clone(),
+			payment_hash,
 			cltv_expiry,
-			state: OutboundHTLCState::LocalAnnounced(Box::new(onion_routing_packet.clone())),
+			state: OutboundHTLCState::LocalAnnounced(Box::new(onion_routing_packet)),
 			source,
 			blinding_point,
 			skimmed_fee_msat,
diff --git a/lightning/src/ln/channelmanager.rs b/lightning/src/ln/channelmanager.rs
index ada27af749f..ee6f96ee30c 100644
--- a/lightning/src/ln/channelmanager.rs
+++ b/lightning/src/ln/channelmanager.rs
@@ -15112,8 +15112,6 @@ impl<
 				}
 			}
 
-			log_debug!(logger, "Generating channel_reestablish events");
-
 			let per_peer_state = self.per_peer_state.read().unwrap();
 			if let Some(peer_state_mutex) = per_peer_state.get(&counterparty_node_id) {
 				let mut peer_state_lock = peer_state_mutex.lock().unwrap();
@@ -15131,6 +15129,11 @@ impl<
 					let logger = WithChannelContext::from(&self.logger, &chan.context(), None);
 					match chan.peer_connected_get_handshake(self.chain_hash, &&logger) {
 						ReconnectionMsg::Reestablish(msg) => {
+							log_debug!(
+								logger,
+								"Generated channel_reestablish event for channel {}",
+								chan.context().channel_id()
+							);
 							pending_msg_events.push(MessageSendEvent::SendChannelReestablish {
 								node_id: chan.context().get_counterparty_node_id(),
 								msg,