Minor fixes for the cl toolchain