Additional fixes to edit flow