diff --git a/explorer-v2/src/lib/ESLintEditor.svelte b/explorer-v2/src/lib/ESLintEditor.svelte
index cc440f2c..8537401c 100644
--- a/explorer-v2/src/lib/ESLintEditor.svelte
+++ b/explorer-v2/src/lib/ESLintEditor.svelte
@@ -3,6 +3,7 @@
 	import MonacoEditor from './MonacoEditor.svelte';
 	import { loadMonacoEditor } from './scripts/monaco-loader';
 	import { createEventDispatcher, onMount } from 'svelte';
+	import { SvelteMap } from 'svelte/reactivity';
 
 	const dispatch = createEventDispatcher();
 
@@ -16,7 +17,7 @@
 	let leftMarkers = [];
 	let rightMarkers = [];
 
-	let messageMap = new Map();
+	let messageMap = new SvelteMap();
 
 	$: showApplyFix = fix && fixedValue !== code;
 	$: {
diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/11-2-$inspect-ts-output.json b/tests/fixtures/parser/ast/svelte5/docs/runes/11-2-$inspect-ts-output.json
index 0b52ca4c..69669535 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/runes/11-2-$inspect-ts-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/runes/11-2-$inspect-ts-output.json
@@ -1188,7 +1188,7 @@
       }
     },
     {
-      "type": "Keyword",
+      "type": "Identifier",
       "value": "with",
       "range": [
         63,
diff --git a/tests/fixtures/parser/ast/svelte5/docs/runes/11-3-$inspect-ts-output.json b/tests/fixtures/parser/ast/svelte5/docs/runes/11-3-$inspect-ts-output.json
index 3a146be6..e247f41f 100644
--- a/tests/fixtures/parser/ast/svelte5/docs/runes/11-3-$inspect-ts-output.json
+++ b/tests/fixtures/parser/ast/svelte5/docs/runes/11-3-$inspect-ts-output.json
@@ -811,7 +811,7 @@
       }
     },
     {
-      "type": "Keyword",
+      "type": "Identifier",
       "value": "with",
       "range": [
         63,
diff --git a/tests/fixtures/parser/ast/ts-await-non-promise01-output.json b/tests/fixtures/parser/ast/ts-await-non-promise01-output.json
index 1600d867..3ff706ee 100644
--- a/tests/fixtures/parser/ast/ts-await-non-promise01-output.json
+++ b/tests/fixtures/parser/ast/ts-await-non-promise01-output.json
@@ -1347,7 +1347,7 @@
       }
     },
     {
-      "type": "Keyword",
+      "type": "Identifier",
       "value": "const",
       "range": [
         41,
diff --git a/tests/fixtures/parser/ast/ts-issue226-output.json b/tests/fixtures/parser/ast/ts-issue226-output.json
index f037ef8f..40511c22 100644
--- a/tests/fixtures/parser/ast/ts-issue226-output.json
+++ b/tests/fixtures/parser/ast/ts-issue226-output.json
@@ -2909,7 +2909,7 @@
       }
     },
     {
-      "type": "Keyword",
+      "type": "Identifier",
       "value": "catch",
       "range": [
         210,