A few annoyances fixed