osx/ios build fixes
osx build updates
merged with osx updates
osx build fixes
more osx build fixes