diff --git a/ts/components/conversation/TimerNotification.tsx b/ts/components/conversation/TimerNotification.tsx
index 156e24fa9..a6e0c7dcd 100644
--- a/ts/components/conversation/TimerNotification.tsx
+++ b/ts/components/conversation/TimerNotification.tsx
@@ -73,8 +73,8 @@ export const TimerNotification = (props: PropsForExpirationTimer) => {
       expirationTimestamp={expirationTimestamp}
       isExpired={props.isExpired}
       isCentered={true}
-      marginInlineStart={`calc(var(--margins-lg) + 6px)`}
-      marginInlineEnd={`calc(var(--margins-lg) + 6px)`}
+      marginInlineStart={'calc(var(--margins-lg) + 6px)'}
+      marginInlineEnd={'calc(var(--margins-lg) + 6px)'}
       key={`readable-message-${messageId}`}
     >
       <StyledTimerNotification
diff --git a/ts/components/conversation/header/ConversationHeaderSubtitle.tsx b/ts/components/conversation/header/ConversationHeaderSubtitle.tsx
index fe4f2fc0e..ceb25417c 100644
--- a/ts/components/conversation/header/ConversationHeaderSubtitle.tsx
+++ b/ts/components/conversation/header/ConversationHeaderSubtitle.tsx
@@ -115,6 +115,7 @@ export const ConversationHeaderSubitle = (props: ConversationHeaderSubitleProps)
           />
         )}
         <span
+          role="button"
           className="module-conversation-header__title-text"
           onKeyPress={(e: any) => {
             if (e.key === 'Enter') {
diff --git a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
index f4a3a43cd..ea2aa25d8 100644
--- a/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
+++ b/ts/components/conversation/right-panel/overlay/disappearing-messages/OverlayDisappearingMessages.tsx
@@ -59,8 +59,7 @@ export const OverlayDisappearingMessages = (props: OverlayDisappearingMessagesPr
 
   // NOTE if there is only 'off' and one disappearing message mode then we trigger single mode
   const singleMode =
-    disappearingModeOptions['off'] !== undefined &&
-    Object.keys(disappearingModeOptions).length === 2
+    disappearingModeOptions.off !== undefined && Object.keys(disappearingModeOptions).length === 2
       ? Object.keys(disappearingModeOptions)[1]
       : undefined;
   const hasOnlyOneMode = Boolean(singleMode && singleMode.length > 0);
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
index f326eab6c..60027a590 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3BatchPoll.ts
@@ -147,7 +147,8 @@ export type SubRequestInboxType = {
   inbox?: {
     /**
      * Deletes all of the user's received messages.
-     @returns a JSON object with one key "deleted" set to the number of deleted messages.
+     * @returns a JSON object with one key "deleted" set to the number of
+     * deleted messages.
      */
     type: 'delete';
   };
diff --git a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts
index c949344ea..14f46ecab 100644
--- a/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts
+++ b/ts/session/apis/open_group_api/sogsv3/sogsV3ClearInbox.ts
@@ -20,7 +20,7 @@ export const clearInbox = async (roomInfos: OpenGroupRequestCommonType): Promise
   const conversation = await Data.getConversationById(converationId);
 
   if (!conversation) {
-    window.log.warn(`clearInbox Matching conversation not found in db`);
+    window.log.warn('clearInbox Matching conversation not found in db');
   } else {
     const options: Array<OpenGroupBatchRow> = [
       {
diff --git a/ts/session/apis/snode_api/expire.ts b/ts/session/apis/snode_api/expire.ts
index 4e0d482b5..f239039ef 100644
--- a/ts/session/apis/snode_api/expire.ts
+++ b/ts/session/apis/snode_api/expire.ts
@@ -223,11 +223,11 @@ type ExpireMessageOnSnodeProps = {
 
 export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
   const { messageHash, expireTimer, extend, shorten } = props;
-  window.log.info(`WIP: expireMessageOnSnode running!`);
+  // window.log.info('WIP: expireMessageOnSnode running!');
 
   if (extend && shorten) {
-    window.log.info(
-      `WIP: expireMessageOnSnode failed! We cannot extend and shorten a message at the same time`,
+    window.log.error(
+      '[expireMessageOnSnode] We cannot extend and shorten a message at the same time',
       messageHash
     );
     return;
@@ -239,7 +239,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
   const ourEd25519Key = await UserUtils.getUserED25519KeyPair();
 
   if (!ourPubKey || !ourEd25519Key) {
-    window.log.info(`WIP: expireMessageOnSnode failed! No pubkey found`, messageHash);
+    window.log.eror('[expireMessageOnSnode] No pubkey found', messageHash);
     return;
   }
 
@@ -254,7 +254,7 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
   });
 
   if (!signResult) {
-    window.log.info(`WIP: Signing message expiry on swarm failed!`, messageHash);
+    window.log.error('[expireMessageOnSnode] Signing message expiry on swarm failed', messageHash);
     return;
   }
 
@@ -289,11 +289,11 @@ export async function expireMessageOnSnode(props: ExpireMessageOnSnodeProps) {
   try {
     const firstSuccessSnode = await firstTrue(promises);
     snode = firstSuccessSnode;
-    window.log.info(`WIP: expireMessageOnSnode firstSuccessSnode`, firstSuccessSnode);
+    // window.log.info(`WIP: expireMessageOnSnode firstSuccessSnode`, firstSuccessSnode);
   } catch (e) {
     const snodeStr = snode ? `${snode.ip}:${snode.port}` : 'null';
     window?.log?.warn(
-      `WIP: loki_message:::expireMessage - ${e.code ? `${e.code} ` : ''}${e.message} by ${
+      `loki_message:::expireMessage - ${e.code ? `${e.code} ` : ''}${e.message} by ${
         ourPubKey.key
       } for ${messageHash} via snode:${snodeStr}`
     );
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index 9bfe2f5f3..bdc6e7509 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -52,6 +52,7 @@ export async function destroyMessagesAndUpdateRedux(
     const messageIds = messages.map(m => m.messageId);
 
     // Delete any attachments
+    // tslint:disable-next-line: prefer-for-of
     for (let i = 0; i < messageIds.length; i++) {
       const message = await Data.getMessageById(messageIds[i]);
       await message?.cleanup();