Further fixes to observation ingestion