More cv tweaks