Change for building with new toolchain