more avatar fixes