Minor fixes extracted from !749
Separated out from !749 (merged) because these are the sort of thing we can easily and quickly fast-track in.
Separated out from !749 (merged) because these are the sort of thing we can easily and quickly fast-track in.