Small Tweaks in NodeConnector