Correct relative path issues