Some fixups

- Fix concurrency issues
- Fix Windows.* references