diff --git a/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt b/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt
index 562c5e91b..1b3c18da1 100644
--- a/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt
+++ b/actions/src/main/java/com/itsaky/androidide/actions/internal/DefaultActionsRegistry.kt
@@ -197,7 +197,7 @@ class DefaultActionsRegistry : ActionsRegistry() {
   /** Executes the given action item with the given */
   fun executeAction(action: ActionItem, data: ActionData) : Job {
     val onMainThread = action.requiresUIThread
-    val context = if (onMainThread) Dispatchers.Main else Dispatchers.Default
+    val context = if (onMainThread) Dispatchers.Main.immediate else Dispatchers.Default
     return actionsCoroutineScope.launch(context) {
       val result = withStopWatch("Action '${action.id}'") {
         action.execAction(data)
@@ -211,7 +211,7 @@ class DefaultActionsRegistry : ActionsRegistry() {
       if (onMainThread) {
         post()
       } else {
-        withContext(Dispatchers.Main) {
+        withContext(Dispatchers.Main.immediate) {
           post()
         }
       }
diff --git a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java
index a37883537..0e680ffd4 100644
--- a/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java
+++ b/subprojects/javac-services/src/main/java/com/itsaky/androidide/javac/services/NBParserFactory.java
@@ -100,7 +100,6 @@ public class NBParserFactory extends ParserFactory {
       } else if (KEEP_COMMENTS_OVERRIDE_KEEP.equals(this.keepCommentsOverride)) {
         keepDocCommentsOverride = true;
       }
-      LOG.debug("'keepComments' overridden to ", this.keepCommentsOverride);
     }
 
     Lexer lexer = scannerFactory.newScanner(input, keepDocCommentsOverride);