calendars and dependencies fixes