Bugfixes for charts