Small updates to the calendar module