Fix some windows issues.
Self-review