Fix broken avatar issues