Chart fixes