diff --git a/radio/src/gui/colorlcd/radio_diagkeys.cpp b/radio/src/gui/colorlcd/radio_diagkeys.cpp
index 2434c86d8..01b821847 100644
--- a/radio/src/gui/colorlcd/radio_diagkeys.cpp
+++ b/radio/src/gui/colorlcd/radio_diagkeys.cpp
@@ -67,7 +67,7 @@ class RadioKeyDiagsWindow : public Window
       //KEYS
       for (uint8_t i = KEY_START; i <= 6; i++) {
         coord_t y = 1 + FH * (i - KEY_START);
-        dc->drawTextAtIndex(KEY_COLUMN, y, STR_VKEYS, (i), 0);
+        dc->drawTextAtIndex(KEY_COLUMN, y, STR_VKEYS, i, 0);
         displayKeyState(dc, 70, y, i);
       }
 #if defined(ROTARY_ENCODER_NAVIGATION)
diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp
index 139db90a9..33b68c992 100644
--- a/radio/src/gui/colorlcd/radio_hardware.cpp
+++ b/radio/src/gui/colorlcd/radio_hardware.cpp
@@ -182,8 +182,8 @@ void RadioHardwarePage::build(FormWindow * window)
   new StaticText(window, grid.getLabelSlot(), STR_DEBUG, 0, FONT(BOLD));
   auto debugAnas = new TextButton(window, grid.getFieldSlot(2, 0), STR_ANALOGS_BTN);
   debugAnas->setPressHandler([=]() -> uint8_t {
-      auto debugAnasPage = new RadioAnaDiagsPage();
-      debugAnasPage->setCloseHandler([=]() {
+      auto debugAnalogsPage = new RadioAnalogsDiagsPage();
+      debugAnalogsPage->setCloseHandler([=]() {
           calib->setFocus();
       });
       return 0;