[TASK] CGL fixes + Travis configuration fix