Fixing path resolution.