diff --git a/platformio.ini b/platformio.ini
index a4a5b260c..2468d31c9 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -26,7 +26,7 @@ custom_flags =
 #    -DVTABLES_IN_FLASH
 #    -DNO_GLOBAL_EEPROM
 #    -DBEARSSL_SSL_BASIC 
-general_flags = -std=c++11 -DNO_GLOBAL_EEPROM -DVTABLES_IN_FLASH
+general_flags = -DNO_GLOBAL_EEPROM
 
 # From https://github.com/esp8266/Arduino/blob/master/tools/sdk/ld
 #  eagle.flash.4m1m.ld = 1019 KB sketch, 1000 KB SPIFFS. 4KB EEPROM, 4KB RFCAL, 12KB WIFI stack, 2052 KB OTA & buffer 
@@ -37,22 +37,21 @@ build_flags = ${common.general_flags} ${common.build_flags_4m1m}
 
 [env]
 framework = arduino
-platform = espressif8266@2.2.3
+platform = espressif8266@2.2.2 ; arduino core 2.5.2
 ;platform = https://github.com/platformio/platform-espressif8266#develop
 ;platform = https://github.com/platformio/platform-espressif8266#feature/stage
 lib_deps =
   https://github.com/rlogiacco/CircularBuffer
   https://github.com/PaulStoffregen/OneWire
   https://github.com/me-no-dev/ESPAsyncWebServer
-  ;https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
   https://github.com/bakercp/CRC32
-  JustWifi@2.0.2
-  AsyncMqttClient@0.8.2
-  EEPROM_Rotate@0.9.2
-  ArduinoJson@6.13.0
-  ESPAsyncUDP
-  ESPAsyncTCP@1.2.2
-  https://github.com/nomis/mcu-uuid-syslog.git
+  https://github.com/nomis/mcu-uuid-syslog
+  JustWifi@2.0.2 ; https://github.com/xoseperez/justwifi
+  AsyncMqttClient@0.8.2 ; https://github.com/marvinroger/async-mqtt-client
+  EEPROM_Rotate@0.9.2 ; https://github.com/xoseperez/eeprom_rotate
+  ArduinoJson@6.13.0 ; https://github.com/bblanchon/ArduinoJson
+  ESPAsyncTCP@1.2.2 ; https://github.com/me-no-dev/ESPAsyncTCP 
+  https://github.com/me-no-dev/ESPAsyncUDP
 upload_speed = 921600
 monitor_speed = 115200
 
@@ -60,9 +59,9 @@ monitor_speed = 115200
 ;upload_port = /dev/cu.wchusbserial14403
 ;upload_port = /dev/cu.usbserial-1440
 
-; comment out these next 2 lines if not using OTA and going direct via USB
-upload_protocol = espota
-upload_port = ems-esp.local
+; uncomment these next 2 lines if using OTA instead of going direct via USB
+;upload_protocol = espota
+;upload_port = ems-esp.local
 
 #
 # These following targets are used by TravisCI to build the firmware versions on Release
diff --git a/src/version.h b/src/version.h
index c38a882f1..f53eaaf41 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b17"
+#define APP_VERSION "1.9.4b18"