Improving robustness of findiso cleanup process.