Charting fixes, take 1