Take two: fix path to toolchain & bld matrix