diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index adfaf6c0f7..558cf0bc4f 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -1758,10 +1758,11 @@ static int generic_action_ok_remap_file_save(const char *path,
    switch (action_type)
    {
       case ACTION_OK_REMAP_FILE_SAVE_CORE:
-         fill_pathname_join(file, core_name, core_name, sizeof(file));
+         if (!string_is_empty(core_name))
+            fill_pathname_join(file, core_name, core_name, sizeof(file));
          break;
       case ACTION_OK_REMAP_FILE_SAVE_GAME:
-         if (core_name)
+         if (!string_is_empty(core_name))
             fill_pathname_join(file, core_name,
                   path_basename(path_get(RARCH_PATH_BASENAME)), sizeof(file));
          break;
diff --git a/menu/menu_display.c b/menu/menu_display.c
index c22f0f5a3a..ad06916709 100644
--- a/menu/menu_display.c
+++ b/menu/menu_display.c
@@ -744,12 +744,10 @@ void menu_display_push_quad(
       const float *colors, int x1, int y1,
       int x2, int y2)
 {
-   menu_display_ctx_coord_draw_t coord_draw;
    float vertex[8];
    video_coords_t coords;
-   video_coord_array_t *ca   = NULL;
-
-   ca = menu_display_get_coords_array();
+   menu_display_ctx_coord_draw_t coord_draw;
+   video_coord_array_t *ca = menu_display_get_coords_array();
 
    vertex[0]             = x1 / (float)width;
    vertex[1]             = y1 / (float)height;