Bug Fixes in Chart API