diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go
index b71e02ccf..04af89215 100644
--- a/pkg/rtc/mediatrackreceiver.go
+++ b/pkg/rtc/mediatrackreceiver.go
@@ -687,7 +687,7 @@ func (t *MediaTrackReceiver) SetLayerSsrcsForRid(mimeType mime.MimeType, rid str
 				matchingLayer.RepairSsrc = repairSSRC
 			}
 		}
-		if ssrcFound {
+		if ssrcFound && (matchingLayer.Ssrc != ssrc || matchingLayer.RepairSsrc != repairSSRC) {
 			t.params.Logger.Warnw(
 				"not overriding ssrc", nil,
 				"rid", rid,
@@ -695,7 +695,7 @@ func (t *MediaTrackReceiver) SetLayerSsrcsForRid(mimeType mime.MimeType, rid str
 				"existingSSRC", matchingLayer.Ssrc,
 				"repairSSRC", repairSSRC,
 				"existingRepairSSRC", matchingLayer.RepairSsrc,
-				"trackInfo", trackInfo,
+				"trackInfo", logger.Proto(trackInfo),
 			)
 		}
 
diff --git a/pkg/rtc/participant.go b/pkg/rtc/participant.go
index e58dcb1c5..20eaaa9d8 100644
--- a/pkg/rtc/participant.go
+++ b/pkg/rtc/participant.go
@@ -1513,7 +1513,7 @@ func (p *ParticipantImpl) setupMigrationTimerLocked() {
 		if p.IsClosed() || p.IsDisconnected() {
 			return
 		}
-		p.subLogger.Debugw("closing subscriber peer connection to aid migration")
+		p.subLogger.Debugw("closing peer connection(s) to aid migration")
 
 		//
 		// Close all down tracks before closing subscriber peer connection.
@@ -1523,7 +1523,7 @@ func (p *ParticipantImpl) setupMigrationTimerLocked() {
 		//
 		p.SubscriptionManager.Close(true)
 
-		p.TransportManager.SubscriberClose()
+		p.TransportManager.Close()
 	})
 }
 
diff --git a/pkg/rtc/transportmanager.go b/pkg/rtc/transportmanager.go
index bd4584ed5..80e5fac87 100644
--- a/pkg/rtc/transportmanager.go
+++ b/pkg/rtc/transportmanager.go
@@ -211,20 +211,6 @@ func (t *TransportManager) Close() {
 	}
 }
 
-func (t *TransportManager) SubscriberClose() {
-	var subscriberClosed atomic.Bool
-	time.AfterFunc(time.Minute, func() { // CLOSE-DEBUG-CLEANUP
-		if !subscriberClosed.Load() {
-			t.params.Logger.Infow(
-				"transport maanager subscriber close timeout",
-				"subscriberClosed", subscriberClosed.Load(),
-			)
-		}
-	})
-	t.subscriber.Close()
-	subscriberClosed.Store(true)
-}
-
 func (t *TransportManager) HasPublisherEverConnected() bool {
 	return t.publisher.HasEverConnected()
 }