diff --git a/gfx/fonts/xdk360_fonts.cpp b/gfx/fonts/xdk360_fonts.cpp
index ba0684f3c2..f5d3e7fc40 100644
--- a/gfx/fonts/xdk360_fonts.cpp
+++ b/gfx/fonts/xdk360_fonts.cpp
@@ -364,11 +364,11 @@ HRESULT d3d9_init_font(const char *font_path)
    unsigned int uiSafeAreaPct = g_extern.console.rmenu.state.rmenu_hd.enable 
 	   ? SAFE_AREA_PCT_HDTV : SAFE_AREA_PCT_4x3;
 
-   video_console.m_cxSafeArea = ( vid->full_x * uiSafeAreaPct ) / 100;
-   video_console.m_cySafeArea = ( vid->full_y * uiSafeAreaPct ) / 100;
+   video_console.m_cxSafeArea = ( vid->win_width * uiSafeAreaPct ) / 100;
+   video_console.m_cySafeArea = ( vid->win_height * uiSafeAreaPct ) / 100;
 
-   video_console.m_cxSafeAreaOffset = ( vid->full_x - video_console.m_cxSafeArea ) / 2;
-   video_console.m_cySafeAreaOffset = ( vid->full_y - video_console.m_cySafeArea ) / 2;
+   video_console.m_cxSafeAreaOffset = ( vid->win_width - video_console.m_cxSafeArea ) / 2;
+   video_console.m_cySafeAreaOffset = ( vid->win_height - video_console.m_cySafeArea ) / 2;
 
    // Create the font
    HRESULT hr = xdk360_video_font_init(&m_Font, font_path);
diff --git a/xdk/xdk_d3d.cpp b/xdk/xdk_d3d.cpp
index 4c5a64264a..f126fe9791 100644
--- a/xdk/xdk_d3d.cpp
+++ b/xdk/xdk_d3d.cpp
@@ -275,8 +275,7 @@ static void xdk_d3d_set_rotation(void * data, unsigned orientation)
 
 #if defined(HAVE_HLSL)
    /* TODO: Move to D3DXMATRIX here */
-   hlsl_set_proj_matrix(XMMatrixRotationZ(d3d->angle));
-   d3d->should_resize = TRUE;
+   hlsl_set_proj_matrix(XMMatrixRotationZ(angle));
 #elif defined(_XBOX1)
    D3DXMATRIX p_out, p_rotate;
    D3DXMatrixIdentity(&p_out);