more fixes in the build scripts