Fix few errors with edit