Fix editing of objects