[CLEANUP] Fix CGL issues