Add scaling to average_combine and median_combine

oops. Thought I caught all of those...