Avatar compatibility improvements

Good question!