Fix Calendar Bugs