Improve handling of escaped paths