Add missing include
Fix bug with new node_id serialization format