Fix EventCalendar bugs