Do some fixups for Release-for-upload.sh