Minor changes to comply with cpf after cpk removal