CV Fixes 2nd Attempt

The merge of the CV Fixes Fork failed to update any of the files. This
is an attempt at doing it directly.  The change log is the same.