More charting tweaks