(XDK1) Some build fixes