Fixed nodeinfo handling