More toolchain robustness