Fixes to editing.