From 263e55f25da43c4f8eb64c544b0b965ef6ee9a4e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travisr@matrix.org>
Date: Tue, 1 Jun 2021 21:05:20 -0600
Subject: [PATCH] Build pass 1

---
 src/client.ts          | 4 ++--
 src/webrtc/callFeed.ts | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client.ts b/src/client.ts
index f316fa1c1..aff5813c0 100644
--- a/src/client.ts
+++ b/src/client.ts
@@ -63,7 +63,7 @@ import {
     IKeyBackupTrustInfo,
     IKeyBackupVersion,
 } from "./crypto/keybackup";
-import { PkDecryption } from "olm";
+import { PkDecryption } from "@matrix-org/olm";
 import { IIdentityServerProvider } from "./@types/IIdentityServerProvider";
 import type Request from "request";
 import { MatrixScheduler } from "./scheduler";
@@ -398,7 +398,7 @@ export class MatrixClient extends EventEmitter {
     private canSupportVoip = false;
     private peekSync: SyncApi = null;
     private isGuestAccount = false;
-    private ongoingScrollbacks: {[roomId: string]: {promise?: Promise<any>, errorTs: number}} = {}; // TODO: Types
+    private ongoingScrollbacks: {[roomId: string]: {promise?: Promise<any>, errorTs?: number}} = {}; // TODO: Types
     private notifTimelineSet: EventTimelineSet = null;
     private cryptoStore: CryptoStore;
     private verificationMethods: string[];
diff --git a/src/webrtc/callFeed.ts b/src/webrtc/callFeed.ts
index 762fe63f8..f8e33f120 100644
--- a/src/webrtc/callFeed.ts
+++ b/src/webrtc/callFeed.ts
@@ -16,7 +16,7 @@ limitations under the License.
 
 import EventEmitter from "events";
 import { SDPStreamMetadataPurpose } from "./callEventTypes";
-import MatrixClient from "../client"
+import { MatrixClient } from "../client"
 import { RoomMember } from "../models/room-member";
 
 export enum CallFeedEvent {