Fixes for initial pie chart