Fixed up build scripts