diff --git a/cores/libretro-video-processor/video_processor_v4l2.c b/cores/libretro-video-processor/video_processor_v4l2.c
index 2b911cbf3a..f41bed05ac 100644
--- a/cores/libretro-video-processor/video_processor_v4l2.c
+++ b/cores/libretro-video-processor/video_processor_v4l2.c
@@ -234,7 +234,7 @@ enumerate_audio_devices(char *buf, size_t buflen)
 
 RETRO_API void VIDEOPROC_CORE_PREFIX(retro_set_environment)(retro_environment_t cb)
 {
-   struct retro_variable envvars[3] = {};
+   struct retro_variable envvars[3];
    char video_devices[ENVVAR_BUFLEN];
    char audio_devices[ENVVAR_BUFLEN];
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 18e3786bed..2b5f1d9366 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -134,13 +134,14 @@ static void setting_get_string_representation_uint_video_monitor_index(void *dat
 static void setting_get_string_representation_uint_custom_viewport_width(void *data,
       char *s, size_t len)
 {
-   rarch_setting_t *setting = (rarch_setting_t*)data;
+   struct retro_game_geometry  *geom    = NULL;
+   struct retro_system_av_info *av_info = NULL;
+   rarch_setting_t *setting             = (rarch_setting_t*)data;
    if (!setting)
       return;
    
-   struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
-   struct retro_game_geometry  *geom = (struct retro_game_geometry*)
-      &av_info->geometry;
+   av_info = video_viewport_get_system_av_info();
+   geom    = (struct retro_game_geometry*)&av_info->geometry;
    
    if (*setting->value.target.unsigned_integer%geom->base_width == 0)
       snprintf(s, len, "%u (%ux)",
@@ -154,13 +155,14 @@ static void setting_get_string_representation_uint_custom_viewport_width(void *d
 static void setting_get_string_representation_uint_custom_viewport_height(void *data,
       char *s, size_t len)
 {
-   rarch_setting_t *setting = (rarch_setting_t*)data;
+   struct retro_game_geometry  *geom    = NULL;
+   struct retro_system_av_info *av_info = NULL;
+   rarch_setting_t *setting             = (rarch_setting_t*)data;
    if (!setting)
       return;
    
-   struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
-   struct retro_game_geometry  *geom = (struct retro_game_geometry*)
-   &av_info->geometry;
+   av_info = video_viewport_get_system_av_info();
+   geom    = (struct retro_game_geometry*)&av_info->geometry;
    
    if (*setting->value.target.unsigned_integer%geom->base_height == 0)
       snprintf(s, len, "%u (%ux)",