Starting modifications for the new toolchain.