More updates to the build script