fixes for Windows not including a pwd module
Merge branch 'bug/windows-no-pwd' into merge