Better handle path and working directories.