Fixing CL compiler bugs.