Fixes for new OpenCV library names