More toolchain things

This day will never end