Avatar compatibility improvements

Good plan