Try to ease the selection around toolchains version upgrades