Small Fixes in NodeConnector. Still doesn't work