Assorted corrections

[none]