Fix compilation with recent toolchains