Fix calendar specifics