Fix issue with scaling average, min, and max metrics. Closes #1692.