Some updates to finalize exporter ofs partners