Fixed two bugs with the CLA.