Optimize some more charting