Fix Editing problems