more fixes for the new charting stuff