Handling relative paths better