Fix Windows build issues

This resolves #333.
4 files changed