nodeId is not required anymore, small fixes