diff --git a/spec/unit/crypto/backup.spec.js b/spec/unit/crypto/backup.spec.js
index 25f6c112a..f1da584f4 100644
--- a/spec/unit/crypto/backup.spec.js
+++ b/spec/unit/crypto/backup.spec.js
@@ -43,13 +43,14 @@ const MegolmDecryption = algorithms.DECRYPTION_CLASSES['m.megolm.v1.aes-sha2'];
 
 const ROOM_ID = '!ROOM:ID';
 
+const SESSION_ID = 'o+21hSjP+mgEmcfdslPsQdvzWnkdt0Wyo00Kp++R8Kc';
 const ENCRYPTED_EVENT = new MatrixEvent({
     type: 'm.room.encrypted',
     room_id: '!ROOM:ID',
     content: {
         algorithm: 'm.megolm.v1.aes-sha2',
         sender_key: 'SENDER_CURVE25519',
-        session_id: 'o+21hSjP+mgEmcfdslPsQdvzWnkdt0Wyo00Kp++R8Kc',
+        session_id: SESSION_ID,
         ciphertext: 'AwgAEjD+VwXZ7PoGPRS/H4kwpAsMp/g+WPvJVtPEKE8fmM9IcT/N'
             + 'CiwPb8PehecDKP0cjm1XO88k6Bw3D17aGiBHr5iBoP7oSw8CXULXAMTkBl'
             + 'mkufRQq2+d0Giy1s4/Cg5n13jSVrSb2q7VTSv1ZHAFjUCsLSfR0gxqcQs',
@@ -222,7 +223,7 @@ describe("MegolmBackup", function() {
                 "qx37WTQrjZLz5tId/uBX9B3/okqAbV1ofl9UnHKno1eipByCpXleAAlAZoJgYnCDOQZD"
                 + "QWzo3luTSfkF9pU1mOILCbbouubs6TVeDyPfgGD9i86J8irHjA",
                 ROOM_ID,
-                'o+21hSjP+mgEmcfdslPsQdvzWnkdt0Wyo00Kp++R8Kc',
+                SESSION_ID,
             ).then(() => {
                 return megolmDecryption.decryptEvent(ENCRYPTED_EVENT);
             }).then((res) => {
@@ -236,10 +237,10 @@ describe("MegolmBackup", function() {
                     rooms: {
                         [ROOM_ID]: {
                             sessions: {
-                                'o+21hSjP+mgEmcfdslPsQdvzWnkdt0Wyo00Kp++R8Kc': KEY_BACKUP_DATA,
+                                SESSION_ID: KEY_BACKUP_DATA,
                             },
                         },
-                    }
+                    },
                 });
             };
             return client.restoreKeyBackups(
diff --git a/src/client.js b/src/client.js
index 5a9481122..9c3a86911 100644
--- a/src/client.js
+++ b/src/client.js
@@ -1032,7 +1032,9 @@ MatrixClient.prototype.restoreKeyBackups = function(
                 if (!roomData.sessions) continue;
 
                 totalKeyCount += Object.keys(roomData.sessions).length;
-                const roomKeys = keysFromRecoverySession(roomData.sessions, decryption, roomId, roomKeys);
+                const roomKeys = keysFromRecoverySession(
+                    roomData.sessions, decryption, roomId, roomKeys,
+                );
                 for (const k of roomKeys) {
                     k.room_id = roomId;
                     keys.push(k);
diff --git a/src/crypto/index.js b/src/crypto/index.js
index 7aa76e37e..b6926b837 100644
--- a/src/crypto/index.js
+++ b/src/crypto/index.js
@@ -974,7 +974,7 @@ Crypto.prototype._backupPayloadForSession = function(
     exportFormat,
 ) {
     // new session.
-    const session = new Olm.InboundGroupSession();
+    const session = new global.Olm.InboundGroupSession();
     try {
         if (exportFormat) {
             session.import_session(sessionKey);
diff --git a/src/crypto/recoverykey.js b/src/crypto/recoverykey.js
index 69dc8ae6e..bb85697e8 100644
--- a/src/crypto/recoverykey.js
+++ b/src/crypto/recoverykey.js
@@ -53,7 +53,10 @@ export function decodeRecoveryKey(recoverykey) {
         }
     }
 
-    if (result.length !== OLM_RECOVERY_KEY_PREFIX.length + global.Olm.PRIVATE_KEY_LENGTH + 1) {
+    if (
+        result.length !==
+        OLM_RECOVERY_KEY_PREFIX.length + global.Olm.PRIVATE_KEY_LENGTH + 1
+    ) {
         throw new Error("Incorrect length");
     }