(360) Build fixes