Clean up avatar issues.