fixup toolchain