diff --git a/examples/make.mk b/examples/make.mk
index 4a2af3c2..95b2593b 100644
--- a/examples/make.mk
+++ b/examples/make.mk
@@ -77,10 +77,6 @@ CFLAGS += \
 	-ffunction-sections \
 	-fdata-sections
 
-ifneq ($(BOARD), msp_exp430f5529lp)
-  CFLAGS += -Wno-error=lto-type-mismatch
-endif
-
 # This causes lots of warning with nrf5x build due to nrfx code
 # CFLAGS += -Wcast-align
 
diff --git a/src/tusb.c b/src/tusb.c
index 271b35f1..e7f5d800 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -71,7 +71,7 @@ char const* const tusb_strerr[TUSB_ERROR_COUNT] = { ERROR_TABLE(ERROR_STRING) };
 static void dump_str_line(uint8_t const* buf, uint16_t count)
 {
   // each line is 16 bytes
-  for(int i=0; i<count; i++)
+  for(uint16_t i=0; i<count; i++)
   {
     const char ch = buf[i];
     tu_printf("%c", isprint(ch) ? ch : '.');
@@ -127,7 +127,7 @@ void tu_print_mem(void const *buf, uint8_t size, uint16_t count)
 
   if ( remain )
   {
-    for(int i=0; i< 16-remain; i++)
+    for(uint16_t i=0; i< 16-remain; i++)
     {
       tu_printf(" ");
       for(int j=0; j<2*size; j++) tu_printf(" ");