MDL-65318 core_calendar: Additional fixes