some fixes to editor in update step