Build script fixups. ;P