diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index 4ca9274596..d192730478 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -939,8 +939,6 @@ bool audio_driver_toggle_mute(void)
 
 bool audio_driver_ctl(enum rarch_audio_ctl_state state, void *data)
 {
-   settings_t        *settings                            = config_get_ptr();
-
    switch (state)
    {
       case RARCH_AUDIO_CTL_DESTROY:
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 2a26b03dfa..e241b645f0 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -40,7 +40,6 @@ extern "C" {
 enum rarch_audio_ctl_state
 {
    RARCH_AUDIO_CTL_NONE = 0,
-   RARCH_AUDIO_CTL_DEINIT,
    RARCH_AUDIO_CTL_DESTROY,
    RARCH_AUDIO_CTL_DESTROY_DATA,
    RARCH_AUDIO_CTL_START,
diff --git a/driver.c b/driver.c
index ac62477c98..ae9967d0b6 100644
--- a/driver.c
+++ b/driver.c
@@ -407,7 +407,7 @@ static void uninit_drivers(int flags)
       camera_driver_ctl(RARCH_CAMERA_CTL_DEINIT, NULL);
 
    if (flags & DRIVER_AUDIO)
-      audio_driver_ctl(RARCH_AUDIO_CTL_DEINIT, NULL);
+      audio_driver_deinit();
 
    if (flags & DRIVERS_VIDEO_INPUT)
       video_driver_deinit();
diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index 0a30b0e6fb..ba730f413c 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -58,10 +58,10 @@ static bool gl_raster_font_upload_atlas(gl_raster_t *font,
    GLenum gl_format                     = GL_LUMINANCE_ALPHA;
    size_t ncomponents                   = 2;
    uint8_t       *tmp                   = NULL;
-   struct retro_hw_render_callback *hwr = NULL;
    bool ancient                         = false; /* add a check here if needed */
-   
-   hwr = video_driver_get_hw_context();
+#if defined(GL_VERSION_3_0)
+   struct retro_hw_render_callback *hwr = video_driver_get_hw_context();
+#endif
 
    if (ancient)
    {