(XDK) Build fixes