Fixed cpd errors