Fixes regarding dependent types in CLS