diff --git a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
index 97a488f44..fd7c36a6d 100644
--- a/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
+++ b/radio/src/targets/common/arm/stm32/bootloader/boot.cpp
@@ -83,11 +83,10 @@ void interrupt10ms()
 #endif
   
   uint8_t index = 0;
-  uint8_t in = readKeys();
-  for (uint8_t i = 1; i != uint8_t(1u << TRM_BASE); i <<= 1) {
-    uint8_t value = (in & i);
-    keys[index].input(value);
-    ++index;
+  uint32_t in = readKeys();
+
+  for (int i = 0; i < TRM_BASE; i++) {
+    keys[index++].input(in & (1 << i));
   }
 
 #if defined(ROTARY_ENCODER_NAVIGATION)
diff --git a/radio/src/targets/nv14/board.h b/radio/src/targets/nv14/board.h
index c272bd0d7..3209b7270 100644
--- a/radio/src/targets/nv14/board.h
+++ b/radio/src/targets/nv14/board.h
@@ -146,9 +146,9 @@ enum EnumKeys
   KEY_PGDN,
   KEY_ENTER,
   KEY_MODEL,
-  KEY_UP = KEY_MODEL,
+  KEY_UP /*= KEY_MODEL*/,
   KEY_EXIT,
-  KEY_DOWN = KEY_EXIT,
+  KEY_DOWN /*= KEY_EXIT*/,
   KEY_TELEM,
   KEY_RIGHT = KEY_TELEM,
   KEY_RADIO,