Fix xplatform build scripts