Fix CVS handling