diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 4caea3661f..58c5b9ae57 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1818,7 +1818,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
 }
 
 char* word_wrap (char* buffer, char* string, int line_width) {
-   int i = 0;
+   unsigned i = 0;
    int k, counter;
 
    while(i < strlen( string ) ) 
diff --git a/menu/menu_event.c b/menu/menu_event.c
index 6b9735786e..026c4b50b2 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -285,17 +285,17 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
       if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L))
       {
          if (osk_idx > OSK_TYPE_UNKNOWN + 1)
-            osk_idx--;
+            osk_idx = (enum osk_type)(osk_idx - 1);
          else
-            osk_idx = OSK_TYPE_LAST - 1;
+            osk_idx = (enum osk_type)(OSK_TYPE_LAST - 1);
       }
 
       if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R))
       {
          if (osk_idx < OSK_TYPE_LAST - 1)
-            osk_idx++;
+            osk_idx = (enum osk_type)(osk_idx + 1);
          else
-            osk_idx = OSK_TYPE_UNKNOWN + 1;
+            osk_idx = (enum osk_type)(OSK_TYPE_UNKNOWN + 1);
       }
 
       if (trigger_input & (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_A))