Tweak some annoyances