diff --git a/conf/distro/include/csl-versions.inc b/conf/distro/include/csl-versions.inc
index 7e45ed8..ea6109a 100644
--- a/conf/distro/include/csl-versions.inc
+++ b/conf/distro/include/csl-versions.inc
@@ -85,8 +85,6 @@ def csl_get_gdb_version(d):
 		return first_line.split()[-1]
 
 python csl_version_handler () {
-    if not isinstance(e, bb.event.ConfigParsed):
-        return
     d = e.data
     ld = d.createCopy()
     ld.finalize()
@@ -97,6 +95,7 @@ python csl_version_handler () {
     d.setVar('CSL_VER_KERNEL', csl_get_kernel_version(ld))
     d.setVar('CSL_VER_GDB', csl_get_gdb_version(ld))
 }
+csl_version_handler[eventmask] = "bb.event.ConfigParsed"
 addhandler csl_version_handler
 
 # Ensure that any variable which includes the --sysroot (CC, CXX, etc) also
diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc
index 5989612..f4a1f68 100644
--- a/conf/distro/include/tcmode-external-sourcery.inc
+++ b/conf/distro/include/tcmode-external-sourcery.inc
@@ -98,9 +98,6 @@ TUNE_LDARGS += "${@'-m ${LDEMULATION}' if LDEMULATION else ''}"
 
 ERROR_QA[type] ?= "list"
 python toolchain_metadata_setup () {
-    if not isinstance(e, bb.event.ConfigParsed):
-        return
-
     import subprocess
     d = e.data
 
@@ -134,6 +131,7 @@ python toolchain_metadata_setup () {
         d.setVar('ERROR_QA', ' '.join(error_qa))
         d.appendVar('WARN_QA', ' ldflags')
 }
+toolchain_metadata_setup[eventmask] = "bb.event.ConfigParsed"
 addhandler toolchain_metadata_setup
 
 def populate_toolchain_links(d):
@@ -151,12 +149,12 @@ def populate_toolchain_links(d):
     for f in files:
         base = os.path.basename(f)
         newpath = os.path.join(bindir, base)
-        try:
-            os.symlink(f, newpath)
-        except OSError as exc:
-            if exc.errno == errno.EEXIST:
-                break
-            bb.fatal("Unable to populate toolchain binary symlink for %s: %s" % (newpath, exc))
+        if not os.path.exists(newpath):
+            with open(newpath, 'w') as new:
+                new.write('#!/bin/sh\n')
+                new.write('export PSEUDO_UNLOAD=1\n')
+                new.write('exec {0} "$@"\n'.format(f))
+            os.chmod(newpath, 0755)
 
     # Ensure that we have a ld.bfd available, now that KERNEL_LD uses it
     ld = d.expand('${TARGET_PREFIX}ld')