(XDK) Some stub build fixes