windows build fixes
osx build fixes