Minor tweaks on Create and Update Event