[TASK] Fix CGL issues