More fixes throughout CLS