Updates to build scripts