avatar minor fixes