Cleanups for nsq river, tweaks for sync connection