Switch to use J1.7 Path instead of File in some instances