Pump fixes to avoid losing values for metrics on aggregation