diff --git a/e2e/playwright/testing-settings.spec.ts b/e2e/playwright/testing-settings.spec.ts
index f888e6ee6..71e448fc9 100644
--- a/e2e/playwright/testing-settings.spec.ts
+++ b/e2e/playwright/testing-settings.spec.ts
@@ -318,7 +318,6 @@ test.describe('Testing settings', () => {
             timeout: 5_000,
           })
           .toContain(`themeColor = "${userThemeColor}"`)
-        // Only close the button after we've confirmed
       })
 
       await test.step('Set project theme color', async () => {
diff --git a/src/components/FileTree.tsx b/src/components/FileTree.tsx
index b3506df40..60d23bb6a 100644
--- a/src/components/FileTree.tsx
+++ b/src/components/FileTree.tsx
@@ -22,6 +22,8 @@ import usePlatform from 'hooks/usePlatform'
 import { FileEntry } from 'lib/project'
 import { useFileSystemWatcher } from 'hooks/useFileSystemWatcher'
 import { normalizeLineEndings } from 'lib/codeEditor'
+import { toSync } from 'lib/utils'
+import { reportRejection } from 'lib/trap'
 
 function getIndentationCSS(level: number) {
   return `calc(1rem * ${level + 1})`
@@ -241,7 +243,7 @@ const FileTreeItem = ({
       // Show the renaming form
       addCurrentItemToRenaming()
     } else if (e.code === 'Space') {
-      void handleClick()
+      toSync(handleClick, reportRejection)
     }
   }
 
@@ -292,7 +294,7 @@ const FileTreeItem = ({
               style={{ paddingInlineStart: getIndentationCSS(level) }}
               onClick={(e) => {
                 e.currentTarget.focus()
-                void handleClick()
+                toSync(handleClick, reportRejection)
               }}
               onKeyUp={handleKeyUp}
             >
diff --git a/src/lang/modifyAst/addFillet.ts b/src/lang/modifyAst/addFillet.ts
index f79e88e82..faf7a41d1 100644
--- a/src/lang/modifyAst/addFillet.ts
+++ b/src/lang/modifyAst/addFillet.ts
@@ -8,7 +8,6 @@ import {
   VariableDeclaration,
   VariableDeclarator,
   sketchFromKclValue,
-  recast,
 } from '../wasm'
 import {
   createCallExpressionStdLib,
@@ -260,9 +259,7 @@ async function updateAstAndFocus(
     focusPath: pathToFilletNode,
   })
 
-  const newCode = recast(updatedAst.newAst)
-  if (err(newCode)) return
-  await codeManager.updateCodeEditor(newCode)
+  await codeManager.updateEditorWithAstAndWriteToFile(updatedAst.newAst)
 
   if (updatedAst?.selections) {
     editorManager.selectRange(updatedAst?.selections)
diff --git a/src/machines/modelingMachine.ts b/src/machines/modelingMachine.ts
index dfde18b3c..ad2fd9eac 100644
--- a/src/machines/modelingMachine.ts
+++ b/src/machines/modelingMachine.ts
@@ -533,7 +533,8 @@ export const modelingMachine = setup({
       }
     ),
     'hide default planes': () => {
-      void kclManager.hidePlanes()
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      kclManager.hidePlanes()
     },
     'reset sketch metadata': assign({
       sketchDetails: null,
@@ -541,7 +542,8 @@ export const modelingMachine = setup({
       sketchPlaneId: '',
     }),
     'reset camera position': () => {
-      void engineCommandManager.sendSceneCommand({
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      engineCommandManager.sendSceneCommand({
         type: 'modeling_cmd_req',
         cmd_id: uuidv4(),
         cmd: {
@@ -699,8 +701,8 @@ export const modelingMachine = setup({
       )
       if (err(applyFilletToSelectionResult)) return applyFilletToSelectionResult
 
-      console.log(applyFilletToSelectionResult)
-      void codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
     },
     'set selection filter to curves only': () => {
       ;(async () => {
@@ -758,7 +760,8 @@ export const modelingMachine = setup({
     'set up draft line': ({ context: { sketchDetails } }) => {
       if (!sketchDetails) return
 
-      void sceneEntitiesManager
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      sceneEntitiesManager
         .setupDraftSegment(
           sketchDetails.sketchPathToNode,
           sketchDetails.zAxis,
@@ -772,7 +775,9 @@ export const modelingMachine = setup({
     },
     'set up draft arc': ({ context: { sketchDetails } }) => {
       if (!sketchDetails) return
-      void sceneEntitiesManager
+
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      sceneEntitiesManager
         .setupDraftSegment(
           sketchDetails.sketchPathToNode,
           sketchDetails.zAxis,
@@ -841,7 +846,8 @@ export const modelingMachine = setup({
       if (event.type !== 'Add rectangle origin') return
       if (!sketchDetails || !event.data) return
 
-      void sceneEntitiesManager
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      sceneEntitiesManager
         .setupDraftRectangle(
           sketchDetails.sketchPathToNode,
           sketchDetails.zAxis,
@@ -857,7 +863,8 @@ export const modelingMachine = setup({
       if (event.type !== 'Add circle origin') return
       if (!sketchDetails || !event.data) return
 
-      void sceneEntitiesManager
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      sceneEntitiesManager
         .setupDraftCircle(
           sketchDetails.sketchPathToNode,
           sketchDetails.zAxis,
@@ -871,7 +878,9 @@ export const modelingMachine = setup({
     },
     'set up draft line without teardown': ({ context: { sketchDetails } }) => {
       if (!sketchDetails) return
-      void sceneEntitiesManager
+
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      sceneEntitiesManager
         .setupDraftSegment(
           sketchDetails.sketchPathToNode,
           sketchDetails.zAxis,
@@ -899,14 +908,17 @@ export const modelingMachine = setup({
     'add axis n grid': ({ context: { sketchDetails } }) => {
       if (!sketchDetails) return
       if (localStorage.getItem('disableAxis')) return
-      void sceneEntitiesManager.createSketchAxis(
+
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      sceneEntitiesManager.createSketchAxis(
         sketchDetails.sketchPathToNode || [],
         sketchDetails.zAxis,
         sketchDetails.yAxis,
         sketchDetails.origin
       )
 
-      void codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      codeManager.updateEditorWithAstAndWriteToFile(kclManager.ast)
     },
     'reset client scene mouse handlers': () => {
       // when not in sketch mode we don't need any mouse listeners
@@ -936,7 +948,8 @@ export const modelingMachine = setup({
       if (event.type !== 'Delete segment') return
       if (!sketchDetails || !event.data) return
 
-      void deleteSegment({
+      // eslint-disable-next-line @typescript-eslint/no-floating-promises
+      deleteSegment({
         pathToNode: event.data,
         sketchDetails,
       }).then(() => {