Yet some more fixes in the build scripts.