Avatar compatibility improvements