Minor updates to build scripts