Mayhem - small updates

Uploading the changes suggested/mentioned in the feedback email from
Tuesday.