minor improvements on CL extensions.