More ingest fixes for the beta push.