Further CV fixes