data service fixes