fix little annoyances