More CV tweaks