Fix and update cv