Merge pull request #1928 from tmccombs/full-path-fixes