More adaptions to CL.