fixes for hiflow exporter