More fixes to darwin build to try to build universal binaries