diff --git a/src/becca/entities/abstract_becca_entity.ts b/src/becca/entities/abstract_becca_entity.ts
index 519a4327f..9476c66d5 100644
--- a/src/becca/entities/abstract_becca_entity.ts
+++ b/src/becca/entities/abstract_becca_entity.ts
@@ -90,14 +90,14 @@ abstract class AbstractBeccaEntity<T extends AbstractBeccaEntity<T>> {
     }
 
     hasStringContent(): boolean {
-        // FIXME: Not sure why some entities don't implement it.
+        // TODO: Not sure why some entities don't implement it.
         return true;
     }
 
     abstract getPojo(): {};
 
     get isDeleted(): boolean {
-        // FIXME: Not sure why some entities don't implement it.
+        // TODO: Not sure why some entities don't implement it.
         return false;
     }
 
diff --git a/src/becca/entities/battachment.ts b/src/becca/entities/battachment.ts
index a5fc02698..be703886c 100644
--- a/src/becca/entities/battachment.ts
+++ b/src/becca/entities/battachment.ts
@@ -15,7 +15,7 @@ const attachmentRoleToNoteTypeMapping = {
 };
 
 interface ContentOpts {
-    // FIXME: Found in bnote.ts, to check if it's actually used and not a typo.
+    // TODO: Found in bnote.ts, to check if it's actually used and not a typo.
     forceSave?: boolean;
 
     /** will also save this BAttachment entity */
@@ -135,7 +135,7 @@ class BAttachment extends AbstractBeccaEntity<BAttachment> {
     }
 
     convertToNote(): { note: BNote, branch: BBranch } {
-        // FIXME: can this ever be "search"?
+        // TODO: can this ever be "search"?
         if (this.type as string === 'search') {
             throw new Error(`Note of type search cannot have child notes`);
         }
diff --git a/src/becca/entities/bblob.ts b/src/becca/entities/bblob.ts
index c37a20581..149b9070a 100644
--- a/src/becca/entities/bblob.ts
+++ b/src/becca/entities/bblob.ts
@@ -1,6 +1,6 @@
 import { BlobRow } from "./rows";
 
-// FIXME: Why this does not extend the abstract becca?
+// TODO: Why this does not extend the abstract becca?
 class BBlob {
     static get entityName() { return "blobs"; }
     static get primaryKeyName() { return "blobId"; }
diff --git a/src/becca/entities/bnote.ts b/src/becca/entities/bnote.ts
index a39d62706..17f7315d1 100644
--- a/src/becca/entities/bnote.ts
+++ b/src/becca/entities/bnote.ts
@@ -899,7 +899,7 @@ class BNote extends AbstractBeccaEntity<BNote> {
             const {searchResultNoteIds} = searchService.searchFromNote(this);
 
             const becca = this.becca;
-            return (searchResultNoteIds as string[])    // FIXME: remove cast once search is converted
+            return (searchResultNoteIds as string[])    // TODO: remove cast once search is converted
                 .map(resultNoteId => becca.notes[resultNoteId])
                 .filter(note => !!note);
         }
diff --git a/src/becca/entities/brevision.ts b/src/becca/entities/brevision.ts
index 43c6631de..9b5e4a410 100644
--- a/src/becca/entities/brevision.ts
+++ b/src/becca/entities/brevision.ts
@@ -88,7 +88,7 @@ class BRevision extends AbstractBeccaEntity<BRevision> {
      *
      * This is the same approach as is used for Note's content.
      */
-    // FIXME: initial declaration included Buffer, but everywhere it's treated as a string.
+    // TODO: initial declaration included Buffer, but everywhere it's treated as a string.
     getContent(): string {
         return this._getContent() as string;
     }
diff --git a/src/becca/entities/rows.ts b/src/becca/entities/rows.ts
index 331f150df..3429676c0 100644
--- a/src/becca/entities/rows.ts
+++ b/src/becca/entities/rows.ts
@@ -1,4 +1,4 @@
-// FIXME: Booleans should probably be numbers instead (as SQLite does not have booleans.);
+// TODO: Booleans should probably be numbers instead (as SQLite does not have booleans.);
 
 export interface AttachmentRow {
     attachmentId?: string;
diff --git a/src/services/encryption/password.ts b/src/services/encryption/password.ts
index 25ac90a57..4d6bf66a3 100644
--- a/src/services/encryption/password.ts
+++ b/src/services/encryption/password.ts
@@ -31,7 +31,7 @@ function changePassword(currentPassword: string, newPassword: string) {
         const newPasswordVerificationKey = utils.toBase64(myScryptService.getVerificationHash(newPassword));
         
         if (decryptedDataKey) {
-            // FIXME: what should happen if the decrypted data key is null?
+            // TODO: what should happen if the decrypted data key is null?
             passwordEncryptionService.setDataKey(newPassword, decryptedDataKey);
         }
 
diff --git a/src/services/sync_mutex.ts b/src/services/sync_mutex.ts
index 655af4d59..9ad0fd08c 100644
--- a/src/services/sync_mutex.ts
+++ b/src/services/sync_mutex.ts
@@ -6,7 +6,7 @@
 const Mutex = require('async-mutex').Mutex;
 const instance = new Mutex();
 
-async function doExclusively<T>(func: () => void) {
+async function doExclusively<T>(func: () => T) {
     const releaseMutex = await instance.acquire();
 
     try {
diff --git a/src/services/utils.ts b/src/services/utils.ts
index 4cbb96d2f..dc6129770 100644
--- a/src/services/utils.ts
+++ b/src/services/utils.ts
@@ -82,7 +82,7 @@ function unescapeHtml(str: string) {
 }
 
 function toObject<T, K extends string | number | symbol, V>(array: T[], fn: (item: T) => [K, V]): Record<K, V> {
-    const obj: Record<K, V> = {} as Record<K, V>; // FIXME: unsafe?
+    const obj: Record<K, V> = {} as Record<K, V>; // TODO: unsafe?
 
     for (const item of array) {
         const ret = fn(item);
@@ -98,7 +98,7 @@ function stripTags(text: string) {
 }
 
 function union<T extends string | number | symbol>(a: T[], b: T[]): T[] {
-    const obj: Record<T, T> = {} as Record<T, T>; // FIXME: unsafe?
+    const obj: Record<T, T> = {} as Record<T, T>; // TODO: unsafe?
 
     for (let i = a.length-1; i >= 0; i--) {
         obj[a[i]] = a[i];