Assorted minor fixes

The ball is back up in the air for @Cadair to grab!

Remember that it's easy to introduce new errors in the final, frantic push of edits, so be watchful