small NConnected cleanups