CVS troubles (cvs/elvis)