Added some missing cases to the calendar unit switch statement. Fixed issue 535.