some minor cleanups to ingest firehose