BRANCH 2.4-DEV: chart fixes