Some NBTInfo fixes