Update for OpenNBT rewrite