Applied old fixes from the calendar project.