Handle paths with spaces better.