fixes for geometry with new topology