[FOLLOWUP] Fix CGL issues