CV and other fixes.
Merge