Minor update of the ShapeAnalyzer