Merge "New attempt at fixing mac build."