diff --git a/esp8266/config.h b/esp8266/config.h
index 55869add..4a8058c9 100644
--- a/esp8266/config.h
+++ b/esp8266/config.h
@@ -50,7 +50,7 @@ extern "C" {
 #include "user_interface.h"
 }
 //version and sources location
-#define FW_VERSION "0.5.1"
+#define FW_VERSION "0.6.0"
 #define REPOSITORY "https://github.com/luc-github/ESP8266"
 
 
diff --git a/esp8266/esp8266.ino b/esp8266/esp8266.ino
index 85d7b203..184ca9b3 100644
--- a/esp8266/esp8266.ino
+++ b/esp8266/esp8266.ino
@@ -129,7 +129,7 @@ void setup()
     //start TCP/IP interface
     data_server = new WiFiServer (wifi_config.idata_port);
     data_server->begin();
-    data_server->setNoDelay(true);
+    //data_server->setNoDelay(true);
 #endif
 
 #ifdef MDNS_FEATURE
diff --git a/esp8266/wifi.cpp b/esp8266/wifi.cpp
index f6c09524..3349aec2 100644
--- a/esp8266/wifi.cpp
+++ b/esp8266/wifi.cpp
@@ -158,7 +158,7 @@ bool WIFI_CONFIG::Setup()
     if (!CONFIG::read_byte(EP_SLEEP_MODE, &bflag )) {
         return false;
     }
-    wifi_set_sleep_type ((sleep_type)bflag);
+    wifi_set_sleep_type ((sleep_type_t)bflag);
     sleep_mode=bflag;
     //AP or client ?
     if (!CONFIG::read_byte(EP_WIFI_MODE, &bflag ) ||  !CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH) ||!CONFIG::read_string(EP_PASSWORD, pwd , MAX_PASSWORD_LENGTH)) {
@@ -178,7 +178,7 @@ bool WIFI_CONFIG::Setup()
         if (!CONFIG::read_byte(EP_PHY_MODE, &bflag )) {
             return false;
         }
-        wifi_set_phy_mode((phy_mode)bflag);
+        wifi_set_phy_mode((phy_mode_t)bflag);
         //get current config
         struct softap_config apconfig;
         wifi_softap_get_config(&apconfig);
@@ -214,7 +214,7 @@ bool WIFI_CONFIG::Setup()
         if (!CONFIG::read_byte(EP_PHY_MODE, &bflag )) {
             return false;
         }
-        wifi_set_phy_mode((phy_mode)bflag);
+        wifi_set_phy_mode((phy_mode_t)bflag);
         delay(500);
         byte i=0;
         //try to connect