Small fixes
Charting