Fix a few more Windows issues.