A few fixes.
A few minor annoyances.