(XDK) More build fixes