diff --git a/chrome/content/scaffold/scaffold.js b/chrome/content/scaffold/scaffold.js
index 88a9064867..49cba64ea4 100644
--- a/chrome/content/scaffold/scaffold.js
+++ b/chrome/content/scaffold/scaffold.js
@@ -271,6 +271,10 @@ var Scaffold = new function () {
 
 	this.initCodeEditor = async function () {
 		let monaco = _editors.codeGlobal, editor = _editors.code;
+		
+		// For some reason, even if we explicitly re-set the default model's language to JavaScript,
+		// Monaco still treats it as TypeScript. Recreating the model manually fixes the issue.
+		editor.setModel(monaco.editor.createModel('', 'javascript', monaco.Uri.parse('inmemory:///translator.js')));
 
 		editor.updateOptions({
 			lineNumbers: num => num + _linesOfMetadata - 1,
@@ -2180,7 +2184,7 @@ var Scaffold = new function () {
 			severity: message.severity * 4,
 			source: 'ESLint',
 			tags: [
-				message.ruleId
+				message.ruleId || '-'
 			]
 		}));
 	}
diff --git a/scripts/config.js b/scripts/config.js
index 3e45c74ecb..d09363f581 100644
--- a/scripts/config.js
+++ b/scripts/config.js
@@ -15,7 +15,6 @@ const symlinkDirs = [
 	'chrome/content/zotero/xpcom/translate/src',
 	'styles',
 	'translators',
-	'resource/vs'
 ];
 
 // list of folders which are copied to the build folder
@@ -56,6 +55,16 @@ const symlinkFiles = [
 	'update.rdf',
 	'!chrome/skin/default/zotero/**/*.scss',
 	'!resource/citeproc_rs_wasm.js',
+	// We only need a few Monaco languages
+	'!resource/vs/**/*',
+	'resource/vs/loader.js',
+	'resource/vs/editor/editor.main.{js,css,nls.js}',
+	'resource/vs/base/**/*',
+	'resource/vs/basic-languages/javascript/*.js',
+	'resource/vs/basic-languages/typescript/*.js',
+	'resource/vs/basic-languages/xml/*.js',
+	'resource/vs/language/typescript/*.js',
+	'resource/vs/language/json/*.js',
 ];