Attempted fixes to the two issues in calendars