Fix connect handshake to not have limbo nodes used by applications