diff --git a/menu/drivers/rmenu.c b/menu/drivers/rmenu.c
index b0d2a45e0d..7ff68044f7 100644
--- a/menu/drivers/rmenu.c
+++ b/menu/drivers/rmenu.c
@@ -123,13 +123,15 @@ end:
 static void rmenu_render(void)
 {
    size_t begin, end, i, j;
-   struct font_params font_parms;
-   char title[256], title_buf[256];
-   char title_msg[64];
-   menu_handle_t *menu      = menu_driver_get_ptr();
-   global_t    *global      = global_get_ptr();
-   uint64_t frame_count     = video_driver_get_frame_count();
-   size_t  entries_end      = menu_entries_get_end();
+   struct font_params font_parms = {0};
+   char title[256]               = {0};
+   char title_buf[256]           = {0};
+   char title_msg[64]            = {0};
+   menu_handle_t *menu           = menu_driver_get_ptr();
+   menu_navigation_t *nav        = menu_navigation_get_ptr();
+   global_t    *global           = global_get_ptr();
+   uint64_t frame_count          = video_driver_get_frame_count();
+   size_t  entries_end           = menu_entries_get_end();
 
    if (!menu)
       return;
@@ -151,10 +153,10 @@ static void rmenu_render(void)
    if (!menu->menu_list->selection_buf)
       return;
 
-   begin = (menu->navigation.selection_ptr >= (ENTRIES_HEIGHT / 2)) ? 
-      (menu->navigation.selection_ptr - (ENTRIES_HEIGHT / 2)) : 0;
-   end   = ((menu->navigation.selection_ptr + ENTRIES_HEIGHT) <= entries_end)
-      ? menu->navigation.selection_ptr + ENTRIES_HEIGHT : entries_end;
+   begin = (nav->selection_ptr >= (ENTRIES_HEIGHT / 2)) ? 
+      (nav->selection_ptr - (ENTRIES_HEIGHT / 2)) : 0;
+   end   = ((nav->selection_ptr + ENTRIES_HEIGHT) <= entries_end)
+      ? nav->selection_ptr + ENTRIES_HEIGHT : entries_end;
 
    if (entries_end <= ENTRIES_HEIGHT)
       begin = 0;
@@ -190,11 +192,13 @@ static void rmenu_render(void)
 
    for (i = begin; i < end; i++, j++)
    {
-      char entry_path[PATH_MAX_LENGTH], entry_value[PATH_MAX_LENGTH];
-      char message[PATH_MAX_LENGTH],
-           entry_title_buf[PATH_MAX_LENGTH], type_str_buf[PATH_MAX_LENGTH];
-      unsigned entry_spacing = menu_entry_get_spacing(i);
-      bool entry_selected = menu_entry_is_currently_selected(i);
+      char entry_path[PATH_MAX_LENGTH]      = {0};
+      char entry_value[PATH_MAX_LENGTH]     = {0};
+      char message[PATH_MAX_LENGTH]         = {0};
+      char entry_title_buf[PATH_MAX_LENGTH] = {0};
+      char type_str_buf[PATH_MAX_LENGTH]    = {0};
+      unsigned entry_spacing                = menu_entry_get_spacing(i);
+      bool entry_selected                   = menu_entry_is_currently_selected(i);
 
       menu_entry_get_value(i, entry_value, sizeof(entry_value));
       menu_entry_get_path(i, entry_path, sizeof(entry_path));
diff --git a/menu/drivers/rmenu_xui.cpp b/menu/drivers/rmenu_xui.cpp
index 29634de1e3..d016358c52 100644
--- a/menu/drivers/rmenu_xui.cpp
+++ b/menu/drivers/rmenu_xui.cpp
@@ -171,13 +171,13 @@ HRESULT XuiTextureLoader(IXuiDevice *pDevice, LPCWSTR szFileName,
       XUIImageInfo *pImageInfo, IDirect3DTexture9 **ppTex)
 {
    D3DXIMAGE_INFO pSrc;
-   CONST BYTE  *pbTextureData = 0;
-   UINT         cbTextureData = 0;
-   HXUIRESOURCE hResource = 0;
-   BOOL         bIsMemoryResource = FALSE;
-   IDirect3DDevice9 * d3dDevice = NULL;
-   HRESULT      hr = XuiResourceOpenNoLoc(szFileName, &hResource,
-         &bIsMemoryResource);
+   CONST BYTE  *pbTextureData      = 0;
+   UINT         cbTextureData      = 0;
+   HXUIRESOURCE hResource          = 0;
+   BOOL         bIsMemoryResource  = FALSE;
+   IDirect3DDevice9 * d3dDevice    = NULL;
+   HRESULT      hr                 = 
+      XuiResourceOpenNoLoc(szFileName, &hResource, &bIsMemoryResource);
 
    if (FAILED(hr))
       return hr; 
@@ -202,7 +202,8 @@ HRESULT XuiTextureLoader(IXuiDevice *pDevice, LPCWSTR szFileName,
          goto cleanup;
       }
 
-      hr = XuiResourceRead(hResource, (BYTE*)pbTextureData, cbTextureData, &cbTextureData);
+      hr = XuiResourceRead(hResource,
+            (BYTE*)pbTextureData, cbTextureData, &cbTextureData);
       if (FAILED(hr))
          goto cleanup;
 
@@ -263,13 +264,14 @@ cleanup:
 static void* rmenu_xui_init(void)
 {
    HRESULT hr;
-   D3DPRESENT_PARAMETERS d3dpp;
-   d3d_video_t *d3d;
-   video_info_t video_info = {0};
+   d3d_video_t *d3d            = NULL;
+   D3DPRESENT_PARAMETERS d3dpp = {0};
+   video_info_t video_info     = {0};
    TypefaceDescriptor typeface = {0};
-   settings_t *settings = config_get_ptr();
-   driver_t   *driver   = driver_get_ptr();
-   menu_handle_t *menu  = (menu_handle_t*)calloc(1, sizeof(*menu));
+   settings_t *settings        = config_get_ptr();
+   driver_t   *driver          = driver_get_ptr();
+   menu_handle_t *menu         = (menu_handle_t*)
+      calloc(1, sizeof(*menu));
 
    if (!menu)
       return NULL;
@@ -357,12 +359,12 @@ static void rmenu_xui_free(void *data)
 
 static void xui_render_message(const char *msg)
 {
-   struct font_params font_parms;
-   size_t i = 0;
-   size_t j = 0;
-   struct string_list *list = NULL;
-   driver_t *driver = driver_get_ptr();
-   d3d_video_t *d3d = (d3d_video_t*)driver->video_data;
+   struct font_params font_parms = {0};
+   size_t i                      = 0;
+   size_t j                      = 0;
+   struct string_list *list      = NULL;
+   driver_t *driver              = driver_get_ptr();
+   d3d_video_t *d3d              = (d3d_video_t*)driver->video_data;
 
    if (!d3d)
       return;