Small updates to CLS