fixes in export services