Fix calendar dates