Small fixes for build scripts.