Fixing compile errors in CCL.