Fix Chart classes to accommodate for recent drawing API changes