fix cwd issues