some toolchain fixes