Fixes to form_cv