Rando cleanup in scripts, some autobuild fixes