Charting fixes