(XDK1) Build fixes