diff --git a/.travis.yml b/.travis.yml
index 03f963d0..d59549ac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ before_script:
   - cd $HOME/arduino_ide/hardware
   - mkdir esp8266com
   - cd esp8266com
-  - git clone -b 2.5.2 https://github.com/esp8266/Arduino.git esp8266
+  - git clone https://github.com/esp8266/Arduino.git esp8266
   - cd esp8266/tools
   - python get.py
   - cd $HOME/arduino_ide/hardware
diff --git a/esp3d/src/modules/filesystem/esp_sd.cpp b/esp3d/src/modules/filesystem/esp_sd.cpp
index 700f7298..f752cd03 100644
--- a/esp3d/src/modules/filesystem/esp_sd.cpp
+++ b/esp3d/src/modules/filesystem/esp_sd.cpp
@@ -17,6 +17,7 @@
   License along with this library; if not, write to the Free Software
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
+
 #include "../../include/esp3d_config.h"
 #ifdef SD_DEVICE
 #include "esp_sd.h"
@@ -29,10 +30,10 @@
 #if ((SD_DEVICE == ESP_SD_NATIVE) || (SD_DEVICE == ESP_SDFAT)) && defined (ARDUINO_ARCH_ESP8266)
 #define FS_NO_GLOBALS
 #define NO_GLOBAL_SD
-#include "SdFat.h"
+#include <SdFat.h>
 sdfat::File tSDFile_handle[ESP_MAX_SD_OPENHANDLE];
 #elif (SD_DEVICE == ESP_SDFAT) && defined (ARDUINO_ARCH_ESP32)
-#include "SdFat.h"
+#include <SdFat.h>
 File tSDFile_handle[ESP_MAX_SD_OPENHANDLE];
 #else
 #include <FS.h>
diff --git a/esp3d/src/modules/filesystem/sd/sd_native_esp8266.cpp b/esp3d/src/modules/filesystem/sd/sd_native_esp8266.cpp
index 3c7f8717..b95e9253 100644
--- a/esp3d/src/modules/filesystem/sd/sd_native_esp8266.cpp
+++ b/esp3d/src/modules/filesystem/sd/sd_native_esp8266.cpp
@@ -42,7 +42,7 @@ void dateTime (uint16_t* date, uint16_t* dtime)
     *dtime = FAT_TIME (tmstruct.tm_hour, tmstruct.tm_min, tmstruct.tm_sec);
 }
 
-time_t getDateTimeFile(File & filehandle)
+time_t getDateTimeFile(sdfat::File & filehandle)
 {
     time_t dt = 0;
     struct tm timefile;
@@ -750,7 +750,7 @@ ESP_SDFile::ESP_SDFile(void* handle, bool isdir, bool iswritemode, const char *
 const char* ESP_SDFile::shortname() const
 {
     static char sname[13];
-    File ftmp = SD.open(_filename.c_str());
+    sdfat::File ftmp = SD.open(_filename.c_str());
     if (ftmp) {
         ftmp.getSFN(sname);
         ftmp.close();
diff --git a/libraries/arduinoWebSockets-2.1.4/src/libb64/cdecode.c b/libraries/arduinoWebSockets-2.1.4/src/libb64/cdecode.c
index e135da24..ce071ac6 100644
--- a/libraries/arduinoWebSockets-2.1.4/src/libb64/cdecode.c
+++ b/libraries/arduinoWebSockets-2.1.4/src/libb64/cdecode.c
@@ -6,6 +6,7 @@ For details, see http://sourceforge.net/projects/libb64
 */
 
 #ifdef ESP8266
+#include <stdint.h>
 #include <core_esp8266_features.h>
 #endif
 
diff --git a/libraries/arduinoWebSockets-2.1.4/src/libb64/cencode.c b/libraries/arduinoWebSockets-2.1.4/src/libb64/cencode.c
index afe1463c..04158eda 100644
--- a/libraries/arduinoWebSockets-2.1.4/src/libb64/cencode.c
+++ b/libraries/arduinoWebSockets-2.1.4/src/libb64/cencode.c
@@ -6,6 +6,7 @@ For details, see http://sourceforge.net/projects/libb64
 */
 
 #ifdef ESP8266
+#include <stdint.h>
 #include <core_esp8266_features.h>
 #endif