Avatar compatibility improvements

aaah :)