A couple of issues fixed for CalendarAgenda