Some minor corrections

One kind of fix per commit, feel free to cherry-pick or whatever that's called in git parlance these days.