Further improve the path helper
2 files changed