More issues fixed

Issues about the calendar