Geometry editing fixes2