diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 6c207e8e20..ac72b96a74 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -253,12 +253,20 @@ static void sdl2_init_renderer(sdl2_video_t *vid)
 static void sdl_refresh_renderer(sdl2_video_t *vid)
 {
    SDL_Rect r;
+
    SDL_RenderClear(vid->renderer);
-   r = (SDL_Rect){ vid->vp.x, vid->vp.y, (int)vid->vp.width, (int)vid->vp.height };
+
+   r.x      = vid->vp.x;
+   r.y      = vid->vp.y;
+   r.w      = (int)vid->vp.width;
+   r.h      = (int)vid->vp.height;
+
    SDL_RenderSetViewport(vid->renderer, &r);
 
    /* breaks int scaling */
-   /* SDL_RenderSetLogicalSize(vid->renderer, vid->vp.width, vid->vp.height); */
+#if 0
+   SDL_RenderSetLogicalSize(vid->renderer, vid->vp.width, vid->vp.height);
+#endif
 }
 
 static void sdl_refresh_viewport(sdl2_video_t *vid)
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index 9efabed9df..7cd24d1700 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -857,11 +857,12 @@ static bool xv_focus(void *data)
 
 static bool xv_suppress_screensaver(void *data, bool enable)
 {
-   (void)data;
-   (void)enable;
    driver_t *driver = driver_get_ptr();
 
-   if (driver->display_type == RARCH_DISPLAY_X11)
+   (void)data;
+   (void)enable;
+
+   if (driver && driver->display_type == RARCH_DISPLAY_X11)
    {
       x11_suspend_screensaver(driver->video_window);
       return true;
diff --git a/menu/intl/menu_hash_de.c b/menu/intl/menu_hash_de.c
index 13938b3644..a3e4ce64e7 100644
--- a/menu/intl/menu_hash_de.c
+++ b/menu/intl/menu_hash_de.c
@@ -853,7 +853,7 @@ const char *menu_hash_to_str_de(uint32_t hash)
 
 int menu_hash_get_help_de(uint32_t hash, char *s, size_t len)
 {
-   uint32_t driver_hash = 0;
+   uint32_t      driver_hash = 0;
    settings_t      *settings = config_get_ptr();
 
    switch (hash)
@@ -1236,4 +1236,4 @@ int menu_hash_get_help_de(uint32_t hash, char *s, size_t len)
    }
 
    return 0;
-}
\ No newline at end of file
+}