Fix minor annoyances.