Orange chart fixes