Graph and pie chart fixes