Small fixes discovered by the rebase against HEAD