Edits to CL utilities source code