Fix issues with path names and cwd