Fixes for windows build
Multi-platform build support