More mac/ios build improvements
15 files changed