Improving the build scripts