fixed issues with windows build