Fixes for chart options