Fixed some annoyances