Fixes in CLS