diff --git a/gfx/d3d/d3d.cpp b/gfx/d3d/d3d.cpp
index d11f22e842..4cb80bcf60 100644
--- a/gfx/d3d/d3d.cpp
+++ b/gfx/d3d/d3d.cpp
@@ -461,7 +461,7 @@ static bool d3d_construct(d3d_video_t *d3d,
    gfx_set_dwm();
 #endif
 
-#if defined(HAVE_MENU) && defined(HAVE_OVERLAY)
+#if defined(HAVE_MENU)
    if (d3d->menu)
       free(d3d->menu);
 
diff --git a/gfx/d3d/d3d.h b/gfx/d3d/d3d.h
index 4a4fbc92e8..b4432562eb 100644
--- a/gfx/d3d/d3d.h
+++ b/gfx/d3d/d3d.h
@@ -55,7 +55,6 @@
 #include "d3d_wrapper.h"
 #include "render_chain_driver.h"
 
-#ifdef HAVE_OVERLAY
 typedef struct
 {
    struct Coords
@@ -69,9 +68,10 @@ typedef struct
    bool enabled;
    float alpha_mod;
    LPDIRECT3DTEXTURE tex;
+#ifdef HAVE_D3D9
    LPDIRECT3DVERTEXBUFFER vert_buf;
-} overlay_t;
 #endif
+} overlay_t;
 
 #ifdef _XBOX
 typedef struct Vertex
@@ -138,7 +138,7 @@ typedef struct d3d_video
 
       bool menu_texture_enable;
       bool menu_texture_full_screen;
-#if defined(HAVE_MENU) && defined(HAVE_OVERLAY)
+#if defined(HAVE_MENU)
       overlay_t *menu;
 #endif
       const renderchain_driver_t *renderchain_driver;
diff --git a/input/drivers_joypad/xdk_joypad.c b/input/drivers_joypad/xdk_joypad.c
index 2f04c2d6b8..485cca4f78 100644
--- a/input/drivers_joypad/xdk_joypad.c
+++ b/input/drivers_joypad/xdk_joypad.c
@@ -165,7 +165,7 @@ static void xdk_joypad_poll(void)
          pad_state[port] = 0;
 
          char msg[512];
-         snprintf(msg, sizeof(msg), "Joypad #%u (%s) disconnected.", i, udev_pads[i].ident);
+         snprintf(msg, sizeof(msg), "Joypad #%u (%s) disconnected.", port, xdk_joypad.ident);
          rarch_main_msg_queue_push(msg, 0, 60, false);
          RARCH_LOG("%s\n", msg);
       }