Minor modifications on CV rutines