More fixes to event create/update