handle swap partitions better during import/export