More cleanup and update of toolchains
Fix Toolchain