Fix calendar service