diff --git a/js/models/conversations.js b/js/models/conversations.js
index f60c1e297..b94ae5060 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1351,6 +1351,7 @@
           timestamp: Date.now(),
         });
         // Start handle ChatMessages (attachments/quote/preview/body)
+        // FIXME AUDRIC handle attachments, quote, preview
         if (conversationType === Message.PRIVATE) {
           await libsession
             .getMessageQueue()
diff --git a/libtextsecure/sendmessage.js b/libtextsecure/sendmessage.js
index 5b87e4cea..e98ce8fa8 100644
--- a/libtextsecure/sendmessage.js
+++ b/libtextsecure/sendmessage.js
@@ -1,4 +1,4 @@
-/* global _, textsecure, WebAPI, libsignal, OutgoingMessage, window, libloki */
+/* global _, textsecure, WebAPI, libsignal, window, OutgoingMessage, libloki */
 
 /* eslint-disable more/no-then, no-bitwise */
 
diff --git a/libtextsecure/sync_request.js b/libtextsecure/sync_request.js
index bfb3e45d7..f17782566 100644
--- a/libtextsecure/sync_request.js
+++ b/libtextsecure/sync_request.js
@@ -15,11 +15,8 @@
     // this.ongroup = this.onGroupSyncComplete.bind(this);
     // receiver.addEventListener('groupsync', this.ongroup);
 
-    const ourNumber = textsecure.storage.user.getNumber();
-
     window.log.info('SyncRequest created. Sending config sync request...');
     const { CONFIGURATION } = textsecure.protobuf.SyncMessage.Request.Type;
-    const user = libsession.Types.PubKey.from(ourNumber);
     const { RequestSyncMessage } = window.libsession.Messages.Outgoing;
 
     const requestConfigurationSyncMessage = new RequestSyncMessage({
@@ -28,7 +25,7 @@
     });
     await libsession
       .getMessageQueue()
-      .send(user, requestConfigurationSyncMessage);
+      .sendSyncMessage(requestConfigurationSyncMessage);
 
     window.log.info('SyncRequest now sending contact sync message...');
     const { CONTACTS } = textsecure.protobuf.SyncMessage.Request.Type;
@@ -36,7 +33,9 @@
       timestamp: Date.now(),
       reqestType: CONTACTS,
     });
-    await libsession.getMessageQueue().send(user, requestContactSyncMessage);
+    await libsession
+      .getMessageQueue()
+      .sendSyncMessage(requestContactSyncMessage);
 
     window.log.info('SyncRequest now sending group sync messsage...');
     const { GROUPS } = textsecure.protobuf.SyncMessage.Request.Type;
@@ -44,7 +43,7 @@
       timestamp: Date.now(),
       reqestType: GROUPS,
     });
-    await libsession.getMessageQueue().send(user, requestGroupSyncMessage);
+    await libsession.getMessageQueue().sendSyncMessage(requestGroupSyncMessage);
 
     this.timeout = setTimeout(this.onTimeout.bind(this), 60000);
   }
diff --git a/ts/session/protocols/MultiDeviceProtocol.ts b/ts/session/protocols/MultiDeviceProtocol.ts
index 1a5b1188f..3958eeec3 100644
--- a/ts/session/protocols/MultiDeviceProtocol.ts
+++ b/ts/session/protocols/MultiDeviceProtocol.ts
@@ -149,9 +149,7 @@ export class MultiDeviceProtocol {
     const pubKey = typeof user === 'string' ? new PubKey(user) : user;
     const authorisations = await this.getPairingAuthorisations(pubKey);
     if (authorisations.length === 0) {
-      const array: Array<PubKey> = new Array();
-      array.push(pubKey);
-      return array;
+      return [pubKey];
     }
     const devices = _.flatMap(
       authorisations,