diff --git a/Sming/Arch/Host/Components/libc/include/sys/pgmspace.h b/Sming/Arch/Host/Components/libc/include/sys/pgmspace.h
index 3d1917db5c..8c88c63ca9 100644
--- a/Sming/Arch/Host/Components/libc/include/sys/pgmspace.h
+++ b/Sming/Arch/Host/Components/libc/include/sys/pgmspace.h
@@ -25,9 +25,9 @@ bool isFlashPtr(const void* ptr);
 #define PGM_P const char*
 #define PGM_VOID_P const void*
 
-#define pgm_read_byte(addr) (*(const unsigned char*)(addr))
-#define pgm_read_word(addr) (*(const unsigned short*)(addr))
-#define pgm_read_dword(addr) (*(const unsigned long*)(addr))
+#define pgm_read_byte(addr) (*(const uint8_t*)(addr))
+#define pgm_read_word(addr) (*(const uint16_t*)(addr))
+#define pgm_read_dword(addr) (*(const uint32_t*)(addr))
 #define pgm_read_float(addr) (*(const float*)(addr))
 
 #define pgm_read_byte_near(addr) pgm_read_byte(addr)
diff --git a/Sming/Components/FlashString b/Sming/Components/FlashString
index 8685d62982..66ab95ebb3 160000
--- a/Sming/Components/FlashString
+++ b/Sming/Components/FlashString
@@ -1 +1 @@
-Subproject commit 8685d629821809c9759c9c15a23127cf08ade5f7
+Subproject commit 66ab95ebb34b270d1875a41b358c73c3c00d2b4e