Server end fixes for ingest