Build fixes for Windows

Jira Issue: WP-123