Avatar compatibility improvements

Also, @Ian-Foote, wat?