Fixing avg & totals dictionaries