diff --git a/gfx/drivers/gl2.c b/gfx/drivers/gl2.c
index 715c14586e..73c07643ad 100644
--- a/gfx/drivers/gl2.c
+++ b/gfx/drivers/gl2.c
@@ -2317,7 +2317,7 @@ static void gl2_renderchain_copy_frame(
          {
             /* Slow path - conv_buffer is preallocated
              * just in case we hit this path. */
-            int h;
+            size_t h;
             const unsigned line_bytes = width * gl->base_size;
             uint8_t *dst              = (uint8_t*)gl->conv_buffer;
             const uint8_t *src        = (const uint8_t*)frame;
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 1f6127d691..ca6abff84a 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -511,7 +511,7 @@ struct menu_state
    menu_dialog_t dialog_st;
    enum menu_action prev_action;
 #ifdef HAVE_RUNAHEAD
-   enum menu_runahead_mode runahead_mode;
+   unsigned int runahead_mode;
 #endif
 
    /* int16_t alignment */