#631 Fix some issues with the avatar