Minor fixes on charts