C++ Driver change fixes, changed segments to ranges on a file instead of
just a filename.