diff --git a/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java b/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java
index 4fb8cd97b2..7ef0df56ab 100644
--- a/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java
+++ b/java_console/autotest/src/main/java/com/rusefi/SimulatorExecHelper.java
@@ -13,10 +13,15 @@ import java.util.function.Consumer;
 public class SimulatorExecHelper {
     private final static NamedThreadFactory THREAD_FACTORY = new NamedThreadFactory("SimulatorExecHelper", true);
 
+    private static final String SIMULATOR_BUILD_RUSEFI_SIMULATOR = "../simulator/build/rusefi_simulator";
     // see also SimulatorHelper
-    private static final String SIMULATOR_BINARY = "../simulator/build/rusefi_simulator.exe";
+    private static final String SIMULATOR_BINARY = getSimulatorBinary();
     private static Process simulatorProcess;
 
+    private static String getSimulatorBinary() {
+        return FileLog.isWindows() ? SIMULATOR_BUILD_RUSEFI_SIMULATOR + ".exe" : SIMULATOR_BUILD_RUSEFI_SIMULATOR;
+    }
+
     /**
      * This is currently used by auto-tests only. Todo: reuse same code for UI-launched simulator?
      */
diff --git a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java
index 0320d6a5eb..00bfdd57bf 100644
--- a/java_console/io/src/main/java/com/rusefi/io/LinkManager.java
+++ b/java_console/io/src/main/java/com/rusefi/io/LinkManager.java
@@ -196,7 +196,7 @@ public class LinkManager implements Closeable {
     public final ExecutorService COMMUNICATION_EXECUTOR = new ThreadPoolExecutor(1, 1,
             0L, TimeUnit.MILLISECONDS,
             COMMUNICATION_QUEUE,
-            new NamedThreadFactory("communication executor"));
+            new NamedThreadFactory("communication executor", true));
 
     public void assertCommunicationThread() {
         if (Thread.currentThread() != communicationThread) {