Fixing chart bugs