Miscellaneous changes

Tom:

A collection of miscellaneous changes (each in their own commit) I had laying around that I think might be useful, but I hadn't yet taken the time to turn them into individuals MRs.

Flo:
All good ideas, albeit with some small slips that I fixed (using many more commits than would be required I am afraid).