diff --git a/src/routes/api/backend_log.ts b/src/routes/api/backend_log.ts
index 1210c404b..a4dbac9ab 100644
--- a/src/routes/api/backend_log.ts
+++ b/src/routes/api/backend_log.ts
@@ -2,7 +2,7 @@
 
 import fs = require('fs');
 import dateUtils = require('../../services/date_utils');
-import dataDir = require('../../services/data_dir.js');
+import dataDir = require('../../services/data_dir');
 const { LOG_DIR } = dataDir;
 
 function getBackendLog() {
diff --git a/src/routes/api/bulk_action.js b/src/routes/api/bulk_action.ts
similarity index 66%
rename from src/routes/api/bulk_action.js
rename to src/routes/api/bulk_action.ts
index 27955cd35..4d1a3e98f 100644
--- a/src/routes/api/bulk_action.js
+++ b/src/routes/api/bulk_action.ts
@@ -1,17 +1,18 @@
-const becca = require('../../becca/becca');
-const bulkActionService = require('../../services/bulk_actions');
+import { Request } from 'express';
+import becca = require('../../becca/becca');
+import bulkActionService = require('../../services/bulk_actions');
 
-function execute(req) {
+function execute(req: Request) {
     const {noteIds, includeDescendants} = req.body;
 
     const affectedNoteIds = getAffectedNoteIds(noteIds, includeDescendants);
 
-    const bulkActionNote = becca.getNote('_bulkAction');
+    const bulkActionNote = becca.getNoteOrThrow('_bulkAction');
 
     bulkActionService.executeActions(bulkActionNote, affectedNoteIds);
 }
 
-function getAffectedNoteCount(req) {
+function getAffectedNoteCount(req: Request) {
     const {noteIds, includeDescendants} = req.body;
 
     const affectedNoteIds = getAffectedNoteIds(noteIds, includeDescendants);
@@ -21,8 +22,8 @@ function getAffectedNoteCount(req) {
     };
 }
 
-function getAffectedNoteIds(noteIds, includeDescendants) {
-    const affectedNoteIds = new Set();
+function getAffectedNoteIds(noteIds: string[], includeDescendants: boolean) {
+    const affectedNoteIds = new Set<string>();
 
     for (const noteId of noteIds) {
         const note = becca.getNote(noteId);
@@ -42,7 +43,7 @@ function getAffectedNoteIds(noteIds, includeDescendants) {
     return affectedNoteIds;
 }
 
-module.exports = {
+export = {
     execute,
     getAffectedNoteCount
 };
diff --git a/src/routes/routes.js b/src/routes/routes.js
index ffa5d4051..7b7d98daf 100644
--- a/src/routes/routes.js
+++ b/src/routes/routes.js
@@ -24,7 +24,7 @@ const indexRoute = require('./index.js');
 // API routes
 const treeApiRoute = require('./api/tree.js');
 const notesApiRoute = require('./api/notes.js');
-const branchesApiRoute = require('./api/branches.js');
+const branchesApiRoute = require('./api/branches');
 const attachmentsApiRoute = require('./api/attachments');
 const autocompleteApiRoute = require('./api/autocomplete');
 const cloningApiRoute = require('./api/cloning');
@@ -47,7 +47,7 @@ const scriptRoute = require('./api/script.js');
 const senderRoute = require('./api/sender.js');
 const filesRoute = require('./api/files.js');
 const searchRoute = require('./api/search');
-const bulkActionRoute = require('./api/bulk_action.js');
+const bulkActionRoute = require('./api/bulk_action');
 const specialNotesRoute = require('./api/special_notes');
 const noteMapRoute = require('./api/note_map.js');
 const clipperRoute = require('./api/clipper.js');
diff --git a/src/services/bulk_actions.ts b/src/services/bulk_actions.ts
index c91b1c0c9..8abc11460 100644
--- a/src/services/bulk_actions.ts
+++ b/src/services/bulk_actions.ts
@@ -150,7 +150,7 @@ function getActions(note: BNote) {
         .filter(a => !!a);
 }
 
-function executeActions(note: BNote, searchResultNoteIds: string[]) {
+function executeActions(note: BNote, searchResultNoteIds: string[] | Set<string>) {
     const actions = getActions(note);
 
     for (const resultNoteId of searchResultNoteIds) {