diff --git a/preload.js b/preload.js
index 78e302266..6718aff28 100644
--- a/preload.js
+++ b/preload.js
@@ -476,6 +476,7 @@ if (
     tmp: require('tmp'),
     path: require('path'),
     basePath: __dirname,
+    attachmentsPath: window.Signal.Migrations.attachmentsPath,
     isWindows,
   };
   /* eslint-enable global-require, import/no-extraneous-dependencies */
diff --git a/test/backup_test.js b/test/backup_test.js
index c0660a4e9..f474f4bff 100644
--- a/test/backup_test.js
+++ b/test/backup_test.js
@@ -1,4 +1,4 @@
-/* global Signal, assert, textsecure, _, libsignal */
+/* global Signal, assert, _, libsignal */
 
 /* eslint-disable no-console */
 
diff --git a/ts/models/messageType.ts b/ts/models/messageType.ts
index c7139479a..7a7cbf589 100644
--- a/ts/models/messageType.ts
+++ b/ts/models/messageType.ts
@@ -132,6 +132,7 @@ export const fillMessageAttributesWithDefaults = (
   return _.defaults(optAttributes, {
     expireTimer: 0, // disabled
     id: uuidv4(),
+    schemaVersion: window.Signal.Types.Message.CURRENT_SCHEMA_VERSION,
   });
 };