diff --git a/platformio.ini b/platformio.ini
index fbb56daed..28433fa36 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -2,8 +2,8 @@
 ; override any settings with your own local ones in pio_local.ini
 
 [platformio]
-default_envs = esp32_4M
-; default_envs = lolin_s3
+; default_envs = esp32_4M
+default_envs = lolin_s3
 ; default_envs = esp32_16M
 ; default_envs = standalone
 
@@ -15,10 +15,10 @@ extra_configs =
 core_build_flags =
   -D ARDUINO_ARCH_ESP32=1
   -D ESP32=1
-  ; -std=gnu++17
+  -std=gnu++17
 
-; core_unbuild_flags = -std=gnu++11
-core_unbuild_flags =
+core_unbuild_flags = -std=gnu++11
+; core_unbuild_flags =
 
 ; my_build_flags is set in pio_local.ini
 my_build_flags =
@@ -33,6 +33,7 @@ build_flags =
   -D ARDUINOJSON_USE_DOUBLE=0
   -D ARDUINOTRACE_ENABLE=0
   -D CONFIG_ETH_ENABLED
+  -D CONFIG_ASYNC_TCP_STACK_SIZE=8192
 
 unbuild_flags =
   ${common.core_unbuild_flags}
@@ -175,8 +176,7 @@ build_flags =
 	-lpthread
   -std=gnu++11 -Og -ggdb
 build_src_flags =
-  ; -Wall -Wextra -Werror -Wswitch-enum -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-unused-lambda-capture -Wno-sign-compare
-  ; -Wall -Wextra -Werror
+  -Wall -Wextra -Werror -Wswitch-enum -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-unused-lambda-capture -Wno-sign-compare
   -Wno-missing-braces
   -I./lib_standalone
   -I./lib/ArduinoJson/src