diff --git a/ESP32/main.ino b/ESP32/main.ino
index 8cfa3f4..1104989 100644
--- a/ESP32/main.ino
+++ b/ESP32/main.ino
@@ -517,14 +517,10 @@ void setup()
 	Serial.println(F("Connect TTY to bus"));
 	b->add_tty(tty_);
 
-	Serial.print(F("Starting panel (on CPU 0, main emulator runs on CPU "));
-	Serial.print(xPortGetCoreID());
-	Serial.println(F(")"));
-	xTaskCreatePinnedToCore(&console_thread_wrapper_panel, "panel", 2048, cnsl, 1, nullptr, 0);
+	Serial.println(F("Starting panel"));
+	xTaskCreate(&console_thread_wrapper_panel, "panel", 2048, cnsl, 1, nullptr);
 
-	xTaskCreatePinnedToCore(&console_thread_wrapper_io,    "c-io",  2048, cnsl, 1, nullptr, 0);
-
-	// setup_wifi_stations();
+	xTaskCreate(&console_thread_wrapper_io,    "c-io",  2048, cnsl, 1, nullptr);
 
 	Serial.print(F("Free RAM after init: "));
 	Serial.println(ESP.getFreeHeap());
diff --git a/ESP32/win32.cpp b/ESP32/win32.cpp
new file mode 120000
index 0000000..caccb16
--- /dev/null
+++ b/ESP32/win32.cpp
@@ -0,0 +1 @@
+../win32.cpp
\ No newline at end of file
diff --git a/ESP32/win32.h b/ESP32/win32.h
new file mode 120000
index 0000000..fba5da8
--- /dev/null
+++ b/ESP32/win32.h
@@ -0,0 +1 @@
+../win32.h
\ No newline at end of file
diff --git a/error.cpp b/error.cpp
index c0f9dcd..6bf3af6 100644
--- a/error.cpp
+++ b/error.cpp
@@ -21,7 +21,7 @@
 {
 	int e = errno;
 
-#if !defined(_WIN32)
+#if !defined(_WIN32) && !defined(ESP32)
 	(void)endwin();
 #endif
 
diff --git a/kw11-l.cpp b/kw11-l.cpp
index 2848e47..d1cc4d6 100644
--- a/kw11-l.cpp
+++ b/kw11-l.cpp
@@ -25,7 +25,7 @@ void thread_wrapper_kw11(void *p)
 kw11_l::kw11_l(bus *const b, console *const cnsl) : b(b), cnsl(cnsl)
 {
 #if defined(ESP32)
-	xTaskCreatePinnedToCore(&thread_wrapper_kw11, "kw11-l", 2048, this, 1, nullptr, 0);
+	xTaskCreate(&thread_wrapper_kw11, "kw11-l", 2048, this, 1, nullptr);
 #else
 	th = new std::thread(std::ref(*this));
 #endif