Tiny fixes in CLS