Fixed script and build