Annoyances fixes