diff --git a/cores/esp8266/WCharacter.h b/cores/esp8266/WCharacter.h
index f37ddb71c3..884eed037b 100644
--- a/cores/esp8266/WCharacter.h
+++ b/cores/esp8266/WCharacter.h
@@ -21,7 +21,9 @@
 #define Character_h
 
 #include <ctype.h>
+#undef isascii
 #define isascii(__c) ((unsigned)(__c)<=0177)
+#undef toascii
 #define toascii(__c)  ((__c)&0177)
 
 // WCharacter.h prototypes
diff --git a/cores/esp8266/WString.cpp b/cores/esp8266/WString.cpp
index c81b594d6c..4efba3e7d7 100644
--- a/cores/esp8266/WString.cpp
+++ b/cores/esp8266/WString.cpp
@@ -722,7 +722,7 @@ void String::remove(unsigned int index, unsigned int count) {
     }
     char *writeTo = buffer + index;
     len = len - count;
-    strncpy(writeTo, buffer + index + count, len - index);
+    memmove(writeTo, buffer + index + count, len - index);
     buffer[len] = 0;
 }