Fix new/edit on events and calendars