Update for modern toolchains