diff --git a/conf/distro/include/sourcery-tuning.inc b/conf/distro/include/sourcery-tuning.inc
index d1c28ba..74c9893 100644
--- a/conf/distro/include/sourcery-tuning.inc
+++ b/conf/distro/include/sourcery-tuning.inc
@@ -16,6 +16,6 @@ TUNE_CCARGS_append = "${@bb.utils.contains('TUNE_FEATURES', 'ppce500mc', ' ' + d
 
 PPCE6500_CCARG = "${@'-te6500' if d.getVar('SOURCERY_GXX_IS_PRO', True) == '1' else '-mcpu=e6500'}"
 TUNE_CCARGS_append = " ${@bb.utils.contains("TUNE_FEATURES", "e6500", ' ' + d.getVar('PPCE6500_CCARG', True), '', d)}"
-TUNE_ASARGS += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-a64 -me6500", "", d)}"
+TUNE_ASARGS_e6500-64b += "${@bb.utils.contains("TUNE_FEATURES", "m64", "-a64 -me6500", "", d)}"
 
 TUNE_CCARGS_remove_t4240rdb-64b = "-mcpu=e6500"
diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc
index 1b520fa..f88530b 100644
--- a/conf/distro/include/tcmode-external-sourcery.inc
+++ b/conf/distro/include/tcmode-external-sourcery.inc
@@ -283,7 +283,10 @@ SOURCERY_VERSION[vardepvalue] = "${SOURCERY_VERSION}"
 EXTERNAL_PV_SUFFIX ?= "-${SOURCERY_VERSION}"
 EXTERNAL_PV_SUFFIX_allarch = ""
 
-BUILDCFG_VARS += "EXTERNAL_TOOLCHAIN EXTERNAL_TARGET_SYS SOURCERY_VERSION GCC_VERSION"
+# Make it clear that this version is the toolchain, not the CodeBench IDE
+SOURCERY_TOOLCHAIN_VERSION = "${SOURCERY_VERSION}"
+
+BUILDCFG_VARS += "EXTERNAL_TOOLCHAIN EXTERNAL_TARGET_SYS SOURCERY_TOOLCHAIN_VERSION GCC_VERSION"
 
 # Adjust tunings to ensure we're using Sourcery G++ multilibs
 require conf/distro/include/sourcery-tuning.inc