Mac build fixes
Windows build fixes