Calendar fix for last and first week of year