Make batch export friendlier