wsi: Fix windows build issues
3 files changed