wavg fixes; v4.6.1