HCSVLAB-782 Minor ingest tidy-ups