diff --git a/src/routes/api/options.js b/src/routes/api/options.js
index e526afe8e..46a612636 100644
--- a/src/routes/api/options.js
+++ b/src/routes/api/options.js
@@ -2,7 +2,6 @@
 
 const optionService = require('../../services/options');
 const log = require('../../services/log');
-const attributes = require('../../services/attributes');
 const searchService = require('../../services/search/services/search');
 
 // options allowed to be updated directly in options dialog
diff --git a/src/services/consistency_checks.js b/src/services/consistency_checks.js
index 5dd026179..e818b8385 100644
--- a/src/services/consistency_checks.js
+++ b/src/services/consistency_checks.js
@@ -460,35 +460,26 @@ class ConsistencyChecks {
 
     runEntityChangeChecks(entityName, key) {
         this.findAndFixIssues(`
-            SELECT 
+            SELECT
               ${key} as entityId
-            FROM 
+            FROM
               ${entityName} 
               LEFT JOIN entity_changes ON entity_changes.entityName = '${entityName}' 
                                       AND entity_changes.entityId = ${key} 
             WHERE 
               entity_changes.id IS NULL`,
             ({entityId}) => {
+                const entity = sql.getRow(`SELECT * FROM ${entityName} WHERE ${key} = ?`, [entityId]);
+
                 if (this.autoFix) {
-                    if (entityName === 'note_contents' || entityName === 'note_revision_contents') {
-                        const entity = entityName === 'note_contents'
-                            ? becca.getNote(entityId)
-                            : becca.getNoteRevision(entityId);
-
-                        entity.setContent(entity.getContent(), true);
-                    }
-                    else {
-                        const entity = becca.getEntity(entityName, entityId);
-
-                        entityChangesService.addEntityChange({
-                            entityName,
-                            entityId,
-                            hash: entity.generateHash(),
-                            isErased: false,
-                            utcDateChanged: entity.getUtcDateChanged(),
-                            isSynced: entityName !== 'options' || entity.isSynced
-                        });
-                    }
+                    entityChangesService.addEntityChange({
+                        entityName,
+                        entityId,
+                        hash: utils.randomString(10), // doesn't matter, will force sync but that's OK
+                        isErased: !!entity.isErased,
+                        utcDateChanged: entity.utcDateModified || entity.utcDateCreated,
+                        isSynced: entityName !== 'options' || entity.isSynced
+                    });
 
                     logFix(`Created missing entity change for entityName=${entityName}, entityId=${entityId}`);
                 } else {
diff --git a/src/services/window.js b/src/services/window.js
index f7309abad..25c4bffa1 100644
--- a/src/services/window.js
+++ b/src/services/window.js
@@ -52,11 +52,6 @@ async function createMainWindow() {
 
     const {BrowserWindow} = require('electron'); // should not be statically imported
 
-    const nativeImage = require('electron').nativeImage
-
-    const image = nativeImage.createFromPath(getIcon())
-    console.log(image)
-
     mainWindow = new BrowserWindow({
         x: mainWindowState.x,
         y: mainWindowState.y,
@@ -70,7 +65,7 @@ async function createMainWindow() {
             spellcheck: spellcheckEnabled
         },
         frame: optionService.getOptionBool('nativeTitleBarVisible'),
-        icon: image
+        icon: getIcon()
     });
 
     mainWindowState.manage(mainWindow);