Fix cl toolchain errors