Get manifest_gen.sh working for a few edge cases previously not considered.