Agenda fixes