more const repairs in AvatarData