First fixes for CV