Fixed some minor issues in cv