Fix calendar issues.