more cv fixes