Support for newer toolchains