Fix issues with CVS concurrency.