Toolchain fileames and few other fixes