New fixes, forgot cv:: in two places.