[TASK] Some cgl fixes