Fixed only CGL issues