Fixup branches for toolchains