Small fixes for CL compilation error and failing test cases