Ingest scheduler improvements