Use consistent batch size everywhere