Avatar compatibility improvements

I think this variable is misnamed