Somewhat better handling of names and avatars.