More fixes needed for national calendar