fix minor annoyances