Various fixes for the cvsip backend.