Make avatars more robust