Fixes for nsq batch river, speedups