Resolve relative path issues
Resolve relative path issues