Final fixes to calendar