HCSVLAB:565 More small fixes to ingest