(360/XDK) Build fixes