Ensured charts call super after drawing, plus minor fixes.