diff --git a/am_fix.c b/am_fix.c
index ef666ef..cef5d2b 100644
--- a/am_fix.c
+++ b/am_fix.c
@@ -269,6 +269,7 @@ switch (gCurrentFunction)
 #ifdef ENABLE_AM_FIX_SHOW_DATA
 			counter = display_update_rate;  // queue up a display update as soon as we switch to RX mode
 #endif
+default:
 			return;
 
 
diff --git a/settings.c b/settings.c
index becb2c6..563a1f9 100644
--- a/settings.c
+++ b/settings.c
@@ -693,7 +693,7 @@ void SETTINGS_SaveChannelName(uint8_t channel, const char * name)
 {
     uint16_t offset = channel * 16;
     uint8_t buf[16] = {0};
-    memcpy(buf, name, MIN(strlen(name), MAX_EDIT_INDEX));
+    memcpy(buf, name, MIN(( int)strlen(name), MAX_EDIT_INDEX));
     EEPROM_WriteBuffer(0x0F50 + offset, buf,8);
     EEPROM_WriteBuffer(0x0F58 + offset, buf + 8,8);
 }