Fix avatar generation / display
Merge