Small changes to build scripts