Mission follow-up

Adds requested changes to/fixes issues with PRs #6324, #6325, #6327, #6328 (see comments)