Changes in avatars management.

More investigation needed for remote games where the Avatar sometimes is not displayed.