Several small details

Many tiny commits, so you can cherry-pick if you don't agree with one or another.