Better handling of avatars.