Fix calendar and other stuff