Fixed updating averages and solves