Fix remote nodes, finally