Avatar compatibility improvements

Just thinking of yesterday's rabbit hole.