Resolving avatar issues