Batch capture fix bugs