Minor fixes for json ingest