Fixes for nsq batch river