ExportResource minor changes