Last of the changes for pathlib

Last of the changes for pathlib