Fixes to charts;