diff --git a/.eslintignore b/.eslintignore
index 101d08eed..aa5911836 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -253,8 +253,8 @@ packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js
 packages/app-desktop/gui/NoteEditor/utils/index.js
-packages/app-desktop/gui/NoteEditor/utils/resourceHandling.js
 packages/app-desktop/gui/NoteEditor/utils/resourceHandling.test.js
+packages/app-desktop/gui/NoteEditor/utils/resourceHandling.js
 packages/app-desktop/gui/NoteEditor/utils/types.js
 packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js
 packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
diff --git a/.gitignore b/.gitignore
index 258f8b20a..814ee1438 100644
--- a/.gitignore
+++ b/.gitignore
@@ -238,8 +238,8 @@ packages/app-desktop/gui/NoteEditor/utils/clipboardUtils.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenu.js
 packages/app-desktop/gui/NoteEditor/utils/contextMenuUtils.js
 packages/app-desktop/gui/NoteEditor/utils/index.js
-packages/app-desktop/gui/NoteEditor/utils/resourceHandling.js
 packages/app-desktop/gui/NoteEditor/utils/resourceHandling.test.js
+packages/app-desktop/gui/NoteEditor/utils/resourceHandling.js
 packages/app-desktop/gui/NoteEditor/utils/types.js
 packages/app-desktop/gui/NoteEditor/utils/useDropHandler.js
 packages/app-desktop/gui/NoteEditor/utils/useEffectiveNoteId.js
diff --git a/packages/app-desktop/jest.setup.js b/packages/app-desktop/jest.setup.js
index 1c7a56a75..177260d47 100644
--- a/packages/app-desktop/jest.setup.js
+++ b/packages/app-desktop/jest.setup.js
@@ -1,5 +1,5 @@
 
-const { default: Logger, TargetType } = require('@joplin/lib/Logger');
+const { default: Logger, TargetType } = require('@joplin/utils/Logger');
 
 // TODO: Some libraries required by test-utils.js seem to fail to import with the
 // jsdom environment.