more fixes for average indicators