More relative path updates
Merge from GitHub