diff --git a/gfx/video_crt_switch.c b/gfx/video_crt_switch.c
index 9a337d735b..635c863904 100644
--- a/gfx/video_crt_switch.c
+++ b/gfx/video_crt_switch.c
@@ -182,7 +182,7 @@ void crt_switch_res_core(unsigned width, unsigned height,
       int crt_switch_center_adjust, int monitor_index, bool dynamic)
 {
    /* ra_core_hz float passed from within
-    * void video_driver_monitor_adjust_system_rates(void) */
+    * video_driver_monitor_adjust_system_rates() */
    if (width == 4)
    {
       width = 320;
diff --git a/retroarch.c b/retroarch.c
index aeabf6bf6b..a627e96d95 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -7862,7 +7862,7 @@ static bool video_driver_init_internal(bool *video_is_threaded)
       video_driver_get_viewport_info(custom_vp);
    }
 
-   system              = runloop_get_system_info();
+   system              = &runloop_system;
 
    video_driver_set_rotation(
             (settings->uints.video_rotation + system->rotation) % 4);
@@ -8198,7 +8198,7 @@ bool video_driver_cached_frame(void)
    return true;
 }
 
-void video_driver_monitor_adjust_system_rates(void)
+static void video_driver_monitor_adjust_system_rates(void)
 {
    float timing_skew                      = 0.0f;
    settings_t *settings                   = configuration_settings;
diff --git a/retroarch.h b/retroarch.h
index 2184a8fae8..af7243999b 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -1710,7 +1710,6 @@ bool video_driver_get_hw_render_interface(const struct
       retro_hw_render_interface **iface);
 bool video_driver_get_viewport_info(struct video_viewport *viewport);
 void video_driver_set_title_buf(void);
-void video_driver_monitor_adjust_system_rates(void);
 
 #if defined(HAVE_MENU) && defined(HAVE_MENU_WIDGETS)
 bool video_driver_has_widgets(void);