diff --git a/README.md b/README.md
index 980e30d..93ae5f9 100644
--- a/README.md
+++ b/README.md
@@ -65,7 +65,7 @@ ENABLE_COPY_CHAN_TO_VFO       := 1       copy current channel into the other VFO
 * Long-press 'M' .. Copy selected channel into same VFO, then switch VFO to frequency mode
 *
 * Long-press '7' .. Toggle selected channel scanlist setting .. if VOX  is disabled in Makefile
-*       or
+* or
 * Long-press '5' .. Toggle selected channel scanlist setting .. if NOAA is disabled in Makefile
 *
 * Long-press '*' .. Start scanning, then toggles scanlist scan 1, 2 or ALL channel scanning
diff --git a/driver/keyboard.c b/driver/keyboard.c
index 1c04fc3..e490a13 100644
--- a/driver/keyboard.c
+++ b/driver/keyboard.c
@@ -54,7 +54,7 @@ static const struct {
     },
     /* First row  */
     {
-        .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_4),
+        .set_to_zero_mask = (uint16_t)(~(1u << GPIOA_PIN_KEYBOARD_4)),
         .pins = {
             { .key = KEY_MENU,  .pin = GPIOA_PIN_KEYBOARD_0},
             { .key = KEY_1,     .pin = GPIOA_PIN_KEYBOARD_1},
@@ -64,7 +64,7 @@ static const struct {
     },
     /* Second row */
     {
-        .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_5),
+        .set_to_zero_mask = (uint16_t)(~(1u << GPIOA_PIN_KEYBOARD_5)),
         .pins = {
             { .key = KEY_UP,    .pin = GPIOA_PIN_KEYBOARD_0},
             { .key = KEY_2 ,    .pin = GPIOA_PIN_KEYBOARD_1},
@@ -74,7 +74,7 @@ static const struct {
     },
     /* Third row */
     {
-        .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_6),
+        .set_to_zero_mask = (uint16_t)(~(1u << GPIOA_PIN_KEYBOARD_6)),
         .pins = {
             { .key = KEY_DOWN,  .pin = GPIOA_PIN_KEYBOARD_0},
             { .key = KEY_3   ,  .pin = GPIOA_PIN_KEYBOARD_1},
@@ -84,7 +84,7 @@ static const struct {
     },
     /* Fourth row */
     {
-        .set_to_zero_mask = ~(1u << GPIOA_PIN_KEYBOARD_7),
+        .set_to_zero_mask = (uint16_t)(~(1u << GPIOA_PIN_KEYBOARD_7)),
         .pins = {
             { .key = KEY_EXIT,  .pin = GPIOA_PIN_KEYBOARD_0},
             { .key = KEY_STAR,  .pin = GPIOA_PIN_KEYBOARD_1},