CameraOpenCV fixes