Made some fixes to CVB based on the latest version of cpf/cpk