node_id -> NodeId
Cleanup warnings