Added fixes for calendar to entries.