More tweaks to the Cray platform and toolchains