Minor tweaks on create event