Fix ingestion flow on batch side.