Set of mixed small changes

Each commit is independent of the others.