path resolution improvements