diff --git a/src/state/CallViewModel/localMember/LocalMember.ts b/src/state/CallViewModel/localMember/LocalMember.ts
index 59dd694b..2f38ad82 100644
--- a/src/state/CallViewModel/localMember/LocalMember.ts
+++ b/src/state/CallViewModel/localMember/LocalMember.ts
@@ -16,9 +16,9 @@ import {
 import { observeParticipantEvents } from "@livekit/components-core";
 import {
   Status as RTCSessionStatus,
+  type LivekitTransport,
   type LivekitTransportConfig,
   type MatrixRTCSession,
-  type Transport,
 } from "matrix-js-sdk/lib/matrixrtc";
 import {
   BehaviorSubject,
@@ -739,7 +739,7 @@ export function enterRTCSession(
 
   // For backwards compatibility with Element Call versions that do not do Matrix 2.0,
   // we add the livekit alias to the transport.
-  let backwardCompatibleTransport: Transport;
+  let backwardCompatibleTransport: LivekitTransport | LivekitTransportConfig;
   if (matrixRTCMode === MatrixRTCMode.Matrix_2_0) {
     backwardCompatibleTransport = transport;
   } else {
diff --git a/src/state/CallViewModel/remoteMembers/ConnectionManager.ts b/src/state/CallViewModel/remoteMembers/ConnectionManager.ts
index a7bf00d7..4614e7aa 100644
--- a/src/state/CallViewModel/remoteMembers/ConnectionManager.ts
+++ b/src/state/CallViewModel/remoteMembers/ConnectionManager.ts
@@ -43,6 +43,8 @@ export class ConnectionManagerData {
   }
 
   private getKey(transport: LivekitTransportConfig): string {
+    // This is enough as a key because the ConnectionManager is already scoped by room.
+    // The ConnectionManager should also be scoped by slotId when we have multi-slot support.
     return transport.livekit_service_url;
   }