(Xbox 1) Build fixes