Fixing things for the calendar still