Some NBT fixes