fixes to calendar-app