Merge pathlib fixes