Fix some annoyances