Minor changes to Avatar