Improve robustness of compiler tools