Resolve relative path issues