Enable 32- and 64-bit cvs