Three small fixes

Each of the three meaningful commits (I hope the two merges won't show up in your history) fixes one small issue, as indicated in the commit messages.