Fixing calendar stuff again