Fixed Calendar Bugs