diff --git a/openrtx/src/ui.c b/openrtx/src/ui.c
index f0ad6b38..6c90ad3a 100644
--- a/openrtx/src/ui.c
+++ b/openrtx/src/ui.c
@@ -74,6 +74,7 @@
 #include <hwconfig.h>
 #include <string.h>
 #include <battery.h>
+#include <input.h>
 
 // Maximum menu entry length
 #define MAX_ENTRY_LEN 12
@@ -503,6 +504,8 @@ void _ui_drawSettingsTimeDate(state_t* last_state)
 
 void _ui_drawSettingsTimeDateSet(state_t* last_state)
 {
+    (void) last_state;
+
     gfx_clearScreen();
     // Print "Time&Date" on top bar
     gfx_print(layout.top_pos, "Time&Date", layout.top_font,
diff --git a/platform/mcu/MK22FN512xxx12/drivers/gpio.c b/platform/mcu/MK22FN512xxx12/drivers/gpio.c
index d5f2912a..e96b1fa3 100644
--- a/platform/mcu/MK22FN512xxx12/drivers/gpio.c
+++ b/platform/mcu/MK22FN512xxx12/drivers/gpio.c
@@ -35,23 +35,23 @@ PORT_Type *getPortFromGPio(const GPIO_Type *gpio)
 
     switch(((unsigned int) gpio))
     {
-        case ((unsigned int) GPIOA):
+        case GPIOA_BASE:
             port = PORTA;
             break;
 
-        case ((unsigned int) GPIOB):
+        case GPIOB_BASE:
             port = PORTB;
             break;
 
-        case ((unsigned int) GPIOC):
+        case GPIOC_BASE:
             port = PORTC;
             break;
 
-        case ((unsigned int) GPIOD):
+        case GPIOD_BASE:
             port = PORTD;
             break;
 
-        case ((unsigned int) GPIOE):
+        case GPIOE_BASE:
             port = PORTE;
             break;