Fix rest of the cvs checkouts