Fix various annoyances