calendar bug fixes