Fixed some build errors in CV stuff