monthly_averages fixes