Updates to build script