Fix to endor package, trying something with toolchain