Geometry editing fixes