Fixes to avatar resolution