batch index fixes