diff --git a/misc.h b/misc.h
index ad1bd64..92c296b 100644
--- a/misc.h
+++ b/misc.h
@@ -32,12 +32,12 @@
 	#define MIN(a, b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
 #endif
 
-#define IS_MR_CHANNEL(x)       ((x) >= MR_CHANNEL_FIRST   && (x) <= MR_CHANNEL_LAST)
+#define IS_MR_CHANNEL(x)       ((x) <= MR_CHANNEL_LAST)
 #define IS_FREQ_CHANNEL(x)     ((x) >= FREQ_CHANNEL_FIRST && (x) <= FREQ_CHANNEL_LAST)
 #define IS_VALID_CHANNEL(x)    ((x) < LAST_CHANNEL)
 
 #define IS_NOAA_CHANNEL(x)     ((x) >= NOAA_CHANNEL_FIRST && (x) <= NOAA_CHANNEL_LAST)
-#define IS_NOT_NOAA_CHANNEL(x) ((x) >= MR_CHANNEL_FIRST   && (x) <= FREQ_CHANNEL_LAST)
+#define IS_NOT_NOAA_CHANNEL(x) ((x) <= FREQ_CHANNEL_LAST)
 
 enum {
 	MR_CHANNEL_FIRST   = 0,
diff --git a/settings.h b/settings.h
index d741138..6ead31b 100644
--- a/settings.h
+++ b/settings.h
@@ -220,6 +220,7 @@ typedef struct {
 
 	uint8_t _pad[1];
 } EEPROM_Config_t;
+
 extern EEPROM_Config_t gEeprom;
 
 #ifdef ENABLE_FMRADIO
diff --git a/ui/main.c b/ui/main.c
index 71f39df..c8e6b71 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -445,7 +445,7 @@ void UI_DisplayMain(void)
 		#ifdef ENABLE_ALARM
 			if (gCurrentFunction == FUNCTION_TRANSMIT && gAlarmState == ALARM_STATE_ALARM)
 			{
-				channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
+				uint8_t channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
 				if (channel == vfo_num)
 					state = VFO_STATE_ALARM;
 			}