diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index 67d7dcb3d0..4e5aea7fbe 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -480,19 +480,20 @@ static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned
 {
    float screenscale               = cocoagl_gfx_ctx_get_native_scale();
 #if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
-   CGRect size;
+   CGRect size, cgrect;
    GLsizei backingPixelWidth, backingPixelHeight;
 #if defined(HAVE_COCOA_METAL)
    NSView *g_view                  = apple_platform.renderView;
 #elif defined(HAVE_COCOA)
    CocoaView *g_view               = g_instance;
 #endif
-   CGRect cgrect                   = NSRectToCGRect([g_view frame]);
 #if MAC_OS_X_VERSION_10_7
    SEL selector                    = NSSelectorFromString(BOXSTRING("convertRectToBacking:"));
    if ([g_view respondsToSelector:selector])
       cgrect                       = NSRectToCGRect([g_view convertRectToBacking:[g_view bounds]]);
+   else
 #endif
+      cgrect                       = NSRectToCGRect([g_view frame]);
    backingPixelWidth               = CGRectGetWidth(cgrect);
    backingPixelHeight              = CGRectGetHeight(cgrect);
    size                            = CGRectMake(0, 0, backingPixelWidth, backingPixelHeight);
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 67ec735263..18a493526b 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -1168,7 +1168,7 @@ const char *video_shader_to_str(enum rarch_shader_type type)
 bool video_shader_is_supported(enum rarch_shader_type type)
 {
    gfx_ctx_flags_t flags;
-   enum display_flags testflag;
+   enum display_flags testflag = GFX_CTX_FLAGS_NONE;
 
    flags.flags     = 0;
 
diff --git a/retroarch.c b/retroarch.c
index 709d76ea48..6ac8375764 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2933,6 +2933,7 @@ static void handle_translation_cb(
       video_driver_frame(raw_output_data, image_width, image_height, pitch);
    }
 
+#ifdef HAVE_AUDIOMIXER
    if (raw_sound_data)
    {
       audio_mixer_stream_params_t params;
@@ -2965,6 +2966,7 @@ static void handle_translation_cb(
          free(params.basename);
       free(img);
    }
+#endif
 
 finish:
    if (error)
@@ -10863,7 +10865,7 @@ static void input_overlay_auto_rotate(input_overlay_t *ol)
    enum overlay_orientation active_overlay_orientation = OVERLAY_ORIENTATION_NONE;
    bool next_overlay_found                             = false;
    bool tmp                                            = false;
-   unsigned next_overlay_index;
+   unsigned next_overlay_index                         = 0;
    size_t i;
 
    /* Sanity check */
diff --git a/retroarch.h b/retroarch.h
index d14bff2d34..6e8a1c7da7 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -856,7 +856,8 @@ enum display_metric_types
 
 enum display_flags
 {
-   GFX_CTX_FLAGS_GL_CORE_CONTEXT = 0,
+   GFX_CTX_FLAGS_NONE            = 0,
+   GFX_CTX_FLAGS_GL_CORE_CONTEXT,
    GFX_CTX_FLAGS_MULTISAMPLING,
    GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES,
    GFX_CTX_FLAGS_HARD_SYNC,