diff --git a/src/Searching.js b/src/Searching.js
index 2b17aee054..596dd2f3d4 100644
--- a/src/Searching.js
+++ b/src/Searching.js
@@ -468,7 +468,7 @@ function restoreEncryptionInfo(searchResultSlice = []) {
                     ev.event.curve25519Key,
                     ev.event.ed25519Key,
                 );
-                ev._forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
+                ev.forwardingCurve25519KeyChain = ev.event.forwardingCurve25519KeyChain;
 
                 delete ev.event.curve25519Key;
                 delete ev.event.ed25519Key;
diff --git a/src/utils/DMRoomMap.ts b/src/utils/DMRoomMap.ts
index aceee1d0a5..3e554f145d 100644
--- a/src/utils/DMRoomMap.ts
+++ b/src/utils/DMRoomMap.ts
@@ -16,7 +16,6 @@ limitations under the License.
 
 import { uniq } from "lodash";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { MatrixClient } from "matrix-js-sdk/src/client";
 
 import { MatrixClientPeg } from '../MatrixClientPeg';
@@ -31,15 +30,13 @@ import { MatrixClientPeg } from '../MatrixClientPeg';
 export default class DMRoomMap {
     private static sharedInstance: DMRoomMap;
 
-    private matrixClient: MatrixClient;
     // TODO: convert these to maps
     private roomToUser: {[key: string]: string} = null;
     private userToRooms: {[key: string]: string[]} = null;
     private hasSentOutPatchDirectAccountDataPatch: boolean;
     private mDirectEvent: object;
 
-    constructor(matrixClient) {
-        this.matrixClient = matrixClient;
+    constructor(private readonly matrixClient: MatrixClient) {
         // see onAccountData
         this.hasSentOutPatchDirectAccountDataPatch = false;