Fix EmptyNdef discovered feature
 - Fix connect / disconnect race condition in P2P case