Little fixes in CLS