Fixed some problems on CL Benchmark