More about the node implementations; cherry-pick some fixes from PR1