Fixed batchSize & limit related bugs