Merge changes from Erika for calendar to work again