I'll draft fixes for both, but I need to see the actual ingest script before touching it. Let me find it.