more work toward fixing the build on win