Eliminate some compiler warnings (in Release mode).
Make changes from commit d8decdae83 Win-specific (issue #213)