Make changes from commit d8decdae83 Win-specific (issue #213)