(XDK360) Build fixes