More CPV fixes