Improved toolchain a bit