Corrected problems with non-existent cpk.xml files