Fixed some problems with life cycle differences between clients to embedded nodes and clients to remote nodes