Fixed show stopper bugs in new ingest framework