These fixes should eliminate the last unf mismatches between production and 4.0 test ingests...