Toolchain fixes