Fixes for averager from test warnings