fixes for calendar