Improve robustness of build process.