(XMB) Build fixes