Chart bug fixes