diff --git a/contractcourt/channel_arbitrator.go b/contractcourt/channel_arbitrator.go
index f73769a10..c30247c3c 100644
--- a/contractcourt/channel_arbitrator.go
+++ b/contractcourt/channel_arbitrator.go
@@ -2824,7 +2824,8 @@ func (c *ChannelArbitrator) channelAttendant(bestHeight int32,
 		case beat := <-c.BlockbeatChan:
 			bestHeight = beat.Height()
 
-			log.Debugf("ChannelArbitrator(%v): new block height=%v",
+			log.Debugf("ChannelArbitrator(%v): received new "+
+				"block: height=%v, processing...",
 				c.cfg.ChanPoint, bestHeight)
 
 			err := c.handleBlockbeat(beat)
diff --git a/htlcswitch/link.go b/htlcswitch/link.go
index 3918d8cc6..4b47a672e 100644
--- a/htlcswitch/link.go
+++ b/htlcswitch/link.go
@@ -2052,6 +2052,9 @@ func (l *channelLink) cleanupSpuriousResponse(pkt *htlcPacket) {
 func (l *channelLink) handleUpstreamMsg(ctx context.Context,
 	msg lnwire.Message) {
 
+	l.log.Tracef("receive upstream msg %v, handling now... ", msg.MsgType())
+	defer l.log.Tracef("handled upstream msg %v", msg.MsgType())
+
 	// First check if the message is an update and we are capable of
 	// receiving updates right now.
 	if msg.MsgType().IsChannelUpdate() && !l.quiescer.CanRecvUpdates() {
diff --git a/htlcswitch/switch.go b/htlcswitch/switch.go
index fea5496c9..c7b154751 100644
--- a/htlcswitch/switch.go
+++ b/htlcswitch/switch.go
@@ -2243,6 +2243,9 @@ func (s *Switch) getLinkByMapping(pkt *htlcPacket) (ChannelLink, error) {
 	chanID := pkt.outgoingChanID
 	aliasID := s.cfg.IsAlias(chanID)
 
+	log.Debugf("Querying outgoing link using chanID=%v, aliasID=%v", chanID,
+		aliasID)
+
 	// Set the originalOutgoingChanID so the proper channel_update can be
 	// sent back if the option-scid-alias feature bit was negotiated.
 	pkt.originalOutgoingChanID = chanID
@@ -2299,6 +2302,9 @@ func (s *Switch) getLinkByMapping(pkt *htlcPacket) (ChannelLink, error) {
 	// forward over it and this is a channel where the option-scid-alias
 	// feature bit was negotiated.
 	if link.IsUnadvertised() {
+		log.Debugf("Link is unadvertised, chanID=%v, baseScid=%v",
+			chanID, baseScid)
+
 		return nil, ErrChannelLinkNotFound
 	}
 
diff --git a/itest/lnd_sweep_test.go b/itest/lnd_sweep_test.go
index 8a0a39665..8f94db7b7 100644
--- a/itest/lnd_sweep_test.go
+++ b/itest/lnd_sweep_test.go
@@ -1139,6 +1139,11 @@ func testSweepHTLCs(ht *lntest.HarnessTest) {
 	// NOTE: We need to subtract 1 from the deadline as the budget must be
 	// used up before the deadline.
 	blocksLeft := outgoingHTLCDeadline - outgoingFuncPosition - 1
+
+	ht.Logf("Bob has incoming sweep tx: %v, outgoing sweep tx: %v, "+
+		"blocksLeft=%v, entering fee bumping now...",
+		incomingSweep.TxHash(), outgoingSweep.TxHash(), blocksLeft)
+
 	for i := int32(0); i < blocksLeft; i++ {
 		// Mine an empty block.
 		ht.MineEmptyBlocks(1)
diff --git a/peer/brontide.go b/peer/brontide.go
index a7081c685..98414d7ef 100644
--- a/peer/brontide.go
+++ b/peer/brontide.go
@@ -2404,7 +2404,7 @@ func messageSummary(msg lnwire.Message) string {
 			msg.ID, msg.Reason)
 
 	case *lnwire.UpdateFulfillHTLC:
-		return fmt.Sprintf("chan_id=%v, id=%v, pre_image=%x, "+
+		return fmt.Sprintf("chan_id=%v, id=%v, preimage=%x, "+
 			"custom_records=%v", msg.ChanID, msg.ID,
 			msg.PaymentPreimage[:], msg.CustomRecords)