ShapeToTopology and usages fixes