Most trait fixes done in bug-fixer, are done in CVP in one way or another, so it's pretty safe to use CVP files over bugfixer files.