[TASK] Fix CGL errors