[TASK] Fix some cgl issues