Fixes to function application section in CLS