minor fixes in toolchain