New avatar fixes