Update NBT utils (from Rush)