diff --git a/frontend/menu/menu_common.c b/frontend/menu/menu_common.c
index 21938ebe47..9d6f5062f5 100644
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@@ -247,7 +247,8 @@ void load_menu_game_prepare_dummy(void)
 
 bool load_menu_game(void)
 {
-   int rarch_argc, ret, i;
+   int rarch_argc, ret;
+   unsigned i;
    struct rarch_main_wrap args = {0};
    char *argv_copy[MAX_ARGS];
    char *rarch_argv[MAX_ARGS] = {NULL};
diff --git a/gfx/context/drm_egl_ctx.c b/gfx/context/drm_egl_ctx.c
index 5accd9148f..f48ca94647 100644
--- a/gfx/context/drm_egl_ctx.c
+++ b/gfx/context/drm_egl_ctx.c
@@ -653,8 +653,8 @@ static bool gfx_ctx_set_video_mode(void *data,
       goto error;
 
    EGLint egl_attribs[16];
-   EGLint *attr = egl_attribs;
-   attr = egl_fill_attribs(attr);
+   EGLint *attr;
+   attr = egl_fill_attribs(egl_attribs);
 
    g_egl_ctx = eglCreateContext(g_egl_dpy, g_config, EGL_NO_CONTEXT,
          attr != egl_attribs ? egl_attribs : NULL);