Fixed some issues with charting