Some tweaking of the build scripts